* uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast
[mmh] / uip / Makefile.in
index a562ad2..1e1ae9b 100644 (file)
@@ -20,15 +20,18 @@ CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
 HESIOD_INCLUDES = @HESIOD_INCLUDES@
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES)
+SASL_INCLUDES = @SASL_INCLUDES@
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES) $(SASL_INCLUDES)
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-MTSLIB   = ../mts/smtp/libsmtp.a
+MTSLIB   = ../mts/libmts.a
 KRB4_LIBS = @KRB4_LIBS@
+SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a $(MTSLIB) ../zotnet/libzot.a
-LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(HESIOD_LIBS) $(LIBS)
+NDBM_LIBS = @NDBM_LIBS@
+LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
+LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT   = @LINT@
 LINTFLAGS = @LINTFLAGS@
@@ -55,9 +58,9 @@ SETGID_MAIL    = @SETGID_MAIL@
        $(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
+CMDS = ali anno burst comp dist flist folder forw install-mh mark mhbuild \
        mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk \
-       msh packf pick prompter refile repl rmf rmm scan send show \
+       msh new packf pick prompter refile repl rmf rmm scan send show \
        sortm whatnow whom
 
 ## removed this from CMDS until I can fix it
@@ -67,24 +70,25 @@ CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
 LCMDS = flists folders next prev
 
 # misc support binaries
-MISC = ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack \
+MISC = ap conflict dp fmtdump mhl post rcvdist rcvpack \
        rcvstore rcvtty slocal spost viamail mhtest
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
 
 # source files
-SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \
-       conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
-       folder.c forw.c ftpsbr.c inc.c install-mh.c mark.c md5.c mhbuild.c \
-       mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c mhlsbr.c \
-       mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c mhpath.c mhshow.c \
-       mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c msgchk.c msh.c mshcmds.c packf.c \
-       pick.c picksbr.c popsbr.c post.c prompter.c rcvdist.c rcvpack.c \
-       rcvstore.c rcvtty.c refile.c repl.c replsbr.c rmf.c rmm.c scan.c \
-       scansbr.c send.c sendsbr.c show.c slocal.c sortm.c spost.c \
-       termsbr.c viamail.c vmh.c vmhsbr.c vmhtest.c whatnow.c whatnowproc.c \
-       whatnowsbr.c whom.c wmh.c
+SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c              \
+       conflict.c dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c      \
+       folder.c forw.c ftpsbr.c inc.c install-mh.c mark.c md5.c mhbuild.c \
+       mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c     \
+       mhlsbr.c mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c   \
+       mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c     \
+       msgchk.c msh.c mshcmds.c new.c packf.c pick.c picksbr.c popsbr.c \
+       post.c prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c         \
+       refile.c repl.c replsbr.c rmf.c rmm.c scan.c scansbr.c send.c     \
+       sendsbr.c show.c slocal.c sortm.c spost.c termsbr.c viamail.c     \
+       vmh.c vmhsbr.c vmhtest.c whatnow.c whatnowproc.c whatnowsbr.c     \
+       whom.c wmh.c
 
 # auxiliary files
 AUX = Makefile.in
@@ -143,8 +147,8 @@ install-mh: install-mh.o $(LOCALLIBS)
 mark: mark.o $(LOCALLIBS)
        $(LINK) mark.o $(LINKLIBS)
 
-mhbuild: mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+mhbuild: mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS)
+       $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o ftpsbr.o md5.o $(LINKLIBS) $(TERMLIB)
 
 mhl: mhl.o mhlsbr.o termsbr.o $(LOCALLIBS)
        $(LINK) mhl.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
@@ -179,6 +183,9 @@ msgchk: msgchk.o $(POPLIB) $(LOCALLIBS)
 msh: msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o $(LOCALLIBS)
        $(LINK) msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
+new: new.o $(LOCALLIBS)
+       $(LINK) new.o $(LINKLIBS)
+
 packf: packf.o dropsbr.o $(LOCALLIBS)
        $(LINK) packf.o dropsbr.o $(LINKLIBS)
 
@@ -225,7 +232,7 @@ show: show.o mhlsbr.o termsbr.o $(LOCALLIBS)
        $(LINK) show.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS)
-       $(LINK) slocal.o aliasbr.o dropsbr.o $(LINKLIBS)
+       $(LINK) slocal.o aliasbr.o dropsbr.o $(NDBM_LIBS) $(LINKLIBS)
 
 sortm: sortm.o $(LOCALLIBS)
        $(LINK) sortm.o $(LINKLIBS)
@@ -248,53 +255,60 @@ whom: whom.o distsbr.o $(LOCALLIBS)
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install everything
-install: install-cmds install-lcmds install-misc install-scmds
+install: install-cmds install-misc install-lcmds install-scmds
 
 # install commands
 install-cmds:
-       $(top_srcdir)/mkinstalldirs $(bindir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        for cmd in $(CMDS); do \
-         $(INSTALL_PROGRAM) $$cmd $(bindir)/$$cmd; \
+         $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
        done
 
 # install links
 install-lcmds:
-       rm -f $(bindir)/flists
-       rm -f $(bindir)/folders
-       rm -f $(bindir)/prev
-       rm -f $(bindir)/next
-       $(LN) $(bindir)/flist  $(bindir)/flists
-       $(LN) $(bindir)/folder $(bindir)/folders
-       $(LN) $(bindir)/show   $(bindir)/prev
-       $(LN) $(bindir)/show   $(bindir)/next
+       rm -f $(DESTDIR)$(bindir)/flists
+       rm -f $(DESTDIR)$(bindir)/folders
+       rm -f $(DESTDIR)$(bindir)/fnext
+       rm -f $(DESTDIR)$(bindir)/fprev
+       rm -f $(DESTDIR)$(bindir)/unseen
+       rm -f $(DESTDIR)$(bindir)/prev
+       rm -f $(DESTDIR)$(bindir)/next
+       rm -f $(DESTDIR)$(libdir)/install-mh
+       $(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
+       $(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
+       $(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/fnext
+       $(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/fprev
+       $(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/unseen
+       $(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
+       $(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/next
 
 # install misc support binaries
 install-misc:
-       $(top_srcdir)/mkinstalldirs $(libdir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
        for misc in $(MISC); do \
-         $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \
+         $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
        done
 
 # install commands with special installation needs (thus no $(SCMDS) use here)
 install-scmds:
        if test x$(SETGID_MAIL) != x; then \
-         $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
+         $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \
        else \
-         $(INSTALL_PROGRAM)                 inc $(bindir)/$$cmd; \
+         $(INSTALL_PROGRAM)                 inc $(DESTDIR)$(bindir)/$$cmd; \
        fi
 
 uninstall:
        for cmd in $(CMDS); do \
-         rm -f $(bindir)/$$cmd; \
+         rm -f $(DESTDIR)$(bindir)/$$cmd; \
        done
        for lcmd in $(LCMDS); do \
-         rm -f $(bindir)/$$lcmd; \
+         rm -f $(DESTDIR)$(bindir)/$$lcmd; \
        done
        for misc in $(MISC); do \
-         rm -f $(libdir)/$$misc; \
+         rm -f $(DESTDIR)$(libdir)/$$misc; \
        done
        for cmd in $(SCMDS); do \
-         rm -f $(bindir)/$$cmd; \
+         rm -f $(DESTDIR)$(bindir)/$$cmd; \
        done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -322,7 +336,7 @@ lint:
 subdir = uip
 
 Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+       cd .. && ./config.status $(subdir)/$@
 
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)