Dropped old show(1) and renamed mhshow(1) to show(1).

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index e592a25..6b1469f 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,7 +17,7 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
+INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
@@ -47,9 +47,9 @@ SETGID_MAIL    = @SETGID_MAIL@
        $(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp conflict dist flist folder forw mmh mark \
+CMDS = ali anno burst comp dist flist folder forw mmh mark \
        mhbuild mhl \
-       mhlist mhmail mhparam mhpath mhshow mhstore msgchk new packf pick \
+       mhlist mhmail mhparam mhpath mhstore msgchk new packf pick \
        print-mimetype prompter rcvdist rcvpack rcvstore refile repl rmf \
        rmm scan send sendfiles show slocal sortm spost whatnow
 
@@ -57,22 +57,22 @@ CMDS = ali anno burst comp conflict dist flist folder forw mmh mark \
 LCMDS = flists folders next prev fnext fprev unseen
 
 # misc support binaries
-MISC = ap dp fmtdump mhtest
+MISC = ap dp fmtdump mhtest mmhwrap
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
 
 # source files
 SRCS = ali.c aliasbr.c anno.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 \
-       mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \
+       dist.c distsbr.c dp.c dropsbr.c flist.c fmtdump.c \
+       folder.c forw.c inc.c mark.c mmh.sh mmhwrap.sh mhbuild.c \
+       mhfree.c mhl.c mhlist.c mhlistsbr.c \
        mhmail.c mhmisc.c mhoutsbr.c mhparam.c mhparse.c \
        mhpath.c mhshow.c mhshowsbr.c mhstore.c mhtest.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 \
+       sendfiles.sh slocal.c sortm.c spost.c termsbr.c \
        whatnow.c whatnowproc.c
 
 # auxiliary files
@@ -102,9 +102,6 @@ burst: burst.o $(LOCALLIBS)
 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 $(LOCALLIBS)
        $(LINK) dist.o whatnowproc.o $(LINKLIBS)
 
@@ -126,21 +123,25 @@ forw: forw.o whatnowproc.o $(LOCALLIBS)
 inc: inc.o scansbr.o termsbr.o $(LOCALLIBS)
        $(LINK) inc.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
+mark: mark.o $(LOCALLIBS)
+       $(LINK) mark.o $(LINKLIBS)
+
 mmh: mmh.sh
        cp $(srcdir)/mmh.sh mmh
        chmod +x mmh
 
-mark: mark.o $(LOCALLIBS)
-       $(LINK) mark.o $(LINKLIBS)
+mmhwrap: mmhwrap.sh
+       sed "s,%bindir%,"$(bindir)"," $(srcdir)/mmhwrap.sh >mmhwrap
+       chmod +x mmhwrap
 
-mhbuild: mhbuild.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhbuild.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o md5.o $(LINKLIBS) $(TERMLIB)
+mhbuild: mhbuild.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o termsbr.o $(LOCALLIBS)
+       $(LINK) mhbuild.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.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)
+mhlist: mhlist.o mhparse.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+       $(LINK) mhlist.o mhparse.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 mhmail: mhmail.o $(LOCALLIBS)
        $(LINK) mhmail.o $(LINKLIBS)
@@ -151,14 +152,14 @@ mhparam: mhparam.o $(LOCALLIBS)
 mhpath: mhpath.o $(LOCALLIBS)
        $(LINK) mhpath.o $(LINKLIBS)
 
-mhshow: mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhshow.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+show: mhshow.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+       $(LINK) mhshow.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
-mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+mhstore: mhstore.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+       $(LINK) mhstore.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
-mhtest: mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
-       $(LINK) mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB)
+mhtest: mhtest.o mhparse.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o $(LOCALLIBS)
+       $(LINK) mhtest.o mhparse.o mhoutsbr.o mhmisc.o mhfree.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 msgchk: msgchk.o $(LOCALLIBS)
        $(LINK) msgchk.o $(LINKLIBS)
@@ -210,9 +211,6 @@ sendfiles: sendfiles.sh
        cp $(srcdir)/sendfiles.sh sendfiles
        chmod +x sendfiles
 
-show: show.o $(LOCALLIBS)
-       $(LINK) show.o $(LINKLIBS)
-
 slocal: slocal.o $(LOCALLIBS)
        $(LINK) slocal.o $(LINKLIBS)