slocal: use mhetcdir instead of NMHETCDIR.

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 09e39ed..d81985f 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,7 +17,6 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"'
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
@@ -32,7 +31,6 @@ TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
 LN = ln
 
@@ -49,17 +47,17 @@ SETGID_MAIL    = @SETGID_MAIL@
        $(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp dist flist folder forw mmh mark mhbuild mhl \
-       mhlist mhmail mhparam mhpath mhshow mhstore msgchk \
-       new packf pick prompter refile repl rmf rmm scan send sendfiles show \
-       sortm whatnow
+CMDS = ali anno burst comp conflict dist flist folder forw mmh mark \
+       mhbuild mhl \
+       mhlist mhmail mhparam mhpath mhshow mhstore msgchk new packf pick \
+       print-mimetype prompter rcvdist rcvpack rcvstore refile repl rmf \
+       rmm scan send sendfiles show slocal sortm spost whatnow
 
 # commands that are links to other commands
-LCMDS = flists folders next prev
+LCMDS = flists folders next prev fnext fprev unseen
 
 # misc support binaries
-MISC = ap conflict dp fmtdump rcvdist rcvpack \
-       rcvstore rcvtty slocal spost mhtest
+MISC = ap dp fmtdump mhtest
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
@@ -69,10 +67,10 @@ 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 inc.c mmh.sh mark.c md5.c mhbuild.c \
        mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \
-       mhlsbr.c mhmail.c mhmisc.c mhoutsbr.c mhparam.c mhparse.c \
+       mhmail.c mhmisc.c mhoutsbr.c mhparam.c mhparse.c \
        mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c \
-       msgchk.c new.c packf.c pick.c picksbr.c \
-       prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c \
+       msgchk.c new.c packf.c pick.c print-mimetype.sh \
+       prompter.c rcvdist.c rcvpack.c rcvstore.c \
        refile.c repl.c rmf.c rmm.c scan.c scansbr.c send.c \
        sendfiles.sh show.c slocal.c sortm.c spost.c termsbr.c \
        whatnow.c whatnowproc.c
@@ -92,8 +90,8 @@ all: $(CMDS) $(MISC) $(SCMDS)
 ali: ali.o aliasbr.o $(LOCALLIBS)
        $(LINK) ali.o aliasbr.o $(LINKLIBS)
 
-ap: ap.o termsbr.o $(LOCALLIBS)
-       $(LINK) ap.o termsbr.o $(LINKLIBS) $(TERMLIB)
+ap: ap.o $(LOCALLIBS)
+       $(LINK) ap.o $(LINKLIBS)
 
 anno: anno.o annosbr.o $(LOCALLIBS)
        $(LINK) anno.o annosbr.o $(LINKLIBS)
@@ -101,17 +99,17 @@ anno: anno.o annosbr.o $(LOCALLIBS)
 burst: burst.o $(LOCALLIBS)
        $(LINK) burst.o $(LINKLIBS)
 
-comp: comp.o whatnowproc.o distsbr.o $(LOCALLIBS)
-       $(LINK) comp.o whatnowproc.o distsbr.o $(LINKLIBS)
+comp: comp.o whatnowproc.o $(LOCALLIBS)
+       $(LINK) comp.o whatnowproc.o $(LINKLIBS)
 
 conflict: conflict.o aliasbr.o $(LOCALLIBS)
        $(LINK) conflict.o aliasbr.o $(LINKLIBS)
 
-dist: dist.o whatnowproc.o distsbr.o $(LOCALLIBS)
-       $(LINK) dist.o whatnowproc.o distsbr.o $(LINKLIBS)
+dist: dist.o whatnowproc.o $(LOCALLIBS)
+       $(LINK) dist.o whatnowproc.o $(LINKLIBS)
 
-dp: dp.o termsbr.o $(LOCALLIBS)
-       $(LINK) dp.o termsbr.o $(LINKLIBS) $(TERMLIB)
+dp: dp.o $(LOCALLIBS)
+       $(LINK) dp.o $(LINKLIBS)
 
 flist: flist.o $(LOCALLIBS)
        $(LINK) flist.o $(LINKLIBS)
@@ -122,11 +120,11 @@ fmtdump: fmtdump.o $(LOCALLIBS)
 folder: folder.o $(LOCALLIBS)
        $(LINK) folder.o $(LINKLIBS)
 
-forw: forw.o whatnowproc.o annosbr.o distsbr.o $(LOCALLIBS)
-       $(LINK) forw.o whatnowproc.o annosbr.o distsbr.o $(LINKLIBS)
+forw: forw.o whatnowproc.o annosbr.o $(LOCALLIBS)
+       $(LINK) forw.o whatnowproc.o annosbr.o $(LINKLIBS)
 
-inc: inc.o scansbr.o dropsbr.o termsbr.o $(LOCALLIBS)
-       $(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+inc: inc.o scansbr.o termsbr.o $(LOCALLIBS)
+       $(LINK) inc.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mmh: mmh.sh
        cp mmh.sh mmh
@@ -138,8 +136,8 @@ mark: mark.o $(LOCALLIBS)
 mhbuild: mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o termsbr.o md5.o $(LOCALLIBS)
        $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o md5.o $(LINKLIBS) $(TERMLIB)
 
-mhl: mhl.o mhlsbr.o termsbr.o $(LOCALLIBS)
-       $(LINK) mhl.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+mhl: mhl.o termsbr.o $(LOCALLIBS)
+       $(LINK) mhl.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mhlist: mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
        $(LINK) mhlist.o mhparse.o mhcachesbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
@@ -171,8 +169,12 @@ new: new.o $(LOCALLIBS)
 packf: packf.o dropsbr.o $(LOCALLIBS)
        $(LINK) packf.o dropsbr.o $(LINKLIBS)
 
-pick: pick.o picksbr.o $(LOCALLIBS)
-       $(LINK) pick.o picksbr.o $(LINKLIBS)
+pick: pick.o $(LOCALLIBS)
+       $(LINK) pick.o $(LINKLIBS)
+
+print-mimetype: print-mimetype.sh
+       cp print-mimetype.sh print-mimetype
+       chmod +x print-mimetype
 
 prompter: prompter.o $(LOCALLIBS)
        $(LINK) prompter.o $(LINKLIBS)
@@ -186,14 +188,11 @@ rcvpack: rcvpack.o dropsbr.o $(LOCALLIBS)
 rcvstore: rcvstore.o $(LOCALLIBS)
        $(LINK) rcvstore.o $(LINKLIBS)
 
-rcvtty: rcvtty.o scansbr.o termsbr.o $(LOCALLIBS)
-       $(LINK) rcvtty.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
 refile: refile.o $(LOCALLIBS)
        $(LINK) refile.o $(LINKLIBS)
 
-repl: repl.o whatnowproc.o annosbr.o distsbr.o $(LOCALLIBS)
-       $(LINK) repl.o whatnowproc.o annosbr.o distsbr.o $(LINKLIBS)
+repl: repl.o whatnowproc.o annosbr.o $(LOCALLIBS)
+       $(LINK) repl.o whatnowproc.o annosbr.o $(LINKLIBS)
 
 rmf: rmf.o $(LOCALLIBS)
        $(LINK) rmf.o $(LINKLIBS)
@@ -211,14 +210,11 @@ sendfiles: sendfiles.sh
        cp sendfiles.sh sendfiles
        chmod +x sendfiles
 
-show: show.o mhlsbr.o termsbr.o $(LOCALLIBS)
-       $(LINK) show.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
-slocal.o: slocal.c
-       $(COMPILE2) $(srcdir)/slocal.c
+show: show.o $(LOCALLIBS)
+       $(LINK) show.o $(LINKLIBS)
 
-slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS)
-       $(LINK) slocal.o aliasbr.o dropsbr.o $(LINKLIBS)
+slocal: slocal.o $(LOCALLIBS)
+       $(LINK) slocal.o $(LINKLIBS)
 
 sortm: sortm.o $(LOCALLIBS)
        $(LINK) sortm.o $(LINKLIBS)
@@ -226,8 +222,8 @@ sortm: sortm.o $(LOCALLIBS)
 spost: spost.o aliasbr.o $(LOCALLIBS)
        $(LINK) spost.o aliasbr.o $(LINKLIBS)
 
-whatnow: whatnow.o annosbr.o distsbr.o $(LOCALLIBS)
-       $(LINK) whatnow.o annosbr.o distsbr.o $(LINKLIBS)
+whatnow: whatnow.o annosbr.o $(LOCALLIBS)
+       $(LINK) whatnow.o annosbr.o $(LINKLIBS)
 
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
@@ -236,7 +232,7 @@ install: install-cmds install-misc install-lcmds install-scmds
 
 # install commands
 install-cmds:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       mkdir -p $(DESTDIR)$(bindir)
        for cmd in $(CMDS); do \
          $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
        done
@@ -260,7 +256,7 @@ install-lcmds:
 
 # install misc support binaries
 install-misc:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+       mkdir -p $(DESTDIR)$(libdir)
        for misc in $(MISC); do \
          $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
        done
@@ -315,7 +311,7 @@ Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
 
 distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
+mmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \