X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=0ae31675da63b3f94b6186784d325de39089072b;hp=48b8524888a589789cc520fb10127de9c2692f0d;hb=155ab56dceb237b491a9d551e2a74aa8d74a16c0;hpb=27826f9353e0f0b04590b7d0f8f83e60462b90f0

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 48b8524..0ae3167 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,8 +17,7 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"'
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
+INCLUDES = -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
@@ -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,29 +47,29 @@ 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 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 slocal spost mhtest
+MISC = ap dp fmtdump mhtest mmhwrap
 
 # 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 inc.c mmh.sh mark.c md5.c mhbuild.c \
-	mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \
+SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.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 md5.c mhbuild.c \
+	mhcachesbr.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 mhstoresbr.c mhtest.c \
-	msgchk.c new.c packf.c pick.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 \
@@ -92,11 +90,11 @@ 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)
+anno: anno.o $(LOCALLIBS)
+	$(LINK) anno.o $(LINKLIBS)
 
 burst: burst.o $(LOCALLIBS)
 	$(LINK) burst.o $(LINKLIBS)
@@ -104,14 +102,11 @@ 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)
 
-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,21 +117,25 @@ fmtdump: fmtdump.o $(LOCALLIBS)
 folder: folder.o $(LOCALLIBS)
 	$(LINK) folder.o $(LINKLIBS)
 
-forw: forw.o whatnowproc.o annosbr.o $(LOCALLIBS)
-	$(LINK) forw.o whatnowproc.o annosbr.o $(LINKLIBS)
+forw: forw.o whatnowproc.o $(LOCALLIBS)
+	$(LINK) forw.o whatnowproc.o $(LINKLIBS)
+
+inc: inc.o scansbr.o termsbr.o $(LOCALLIBS)
+	$(LINK) inc.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
-inc: inc.o scansbr.o dropsbr.o termsbr.o $(LOCALLIBS)
-	$(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
+mark: mark.o $(LOCALLIBS)
+	$(LINK) mark.o $(LINKLIBS)
 
 mmh: mmh.sh
-	cp mmh.sh mmh
+	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 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)
+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)
 
 mhl: mhl.o termsbr.o $(LOCALLIBS)
 	$(LINK) mhl.o termsbr.o $(LINKLIBS) $(TERMLIB)
@@ -156,8 +155,8 @@ mhpath: mhpath.o $(LOCALLIBS)
 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)
 
-mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o termsbr.o md5.o $(LOCALLIBS)
-	$(LINK) mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o mhmisc.o mhfree.o termsbr.o md5.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)
 
 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)
@@ -174,6 +173,10 @@ packf: packf.o dropsbr.o $(LOCALLIBS)
 pick: pick.o $(LOCALLIBS)
 	$(LINK) pick.o $(LINKLIBS)
 
+print-mimetype: print-mimetype.sh
+	cp $(srcdir)/print-mimetype.sh print-mimetype
+	chmod +x print-mimetype
+
 prompter: prompter.o $(LOCALLIBS)
 	$(LINK) prompter.o $(LINKLIBS)
 
@@ -189,8 +192,8 @@ rcvstore: rcvstore.o $(LOCALLIBS)
 refile: refile.o $(LOCALLIBS)
 	$(LINK) refile.o $(LINKLIBS)
 
-repl: repl.o whatnowproc.o annosbr.o $(LOCALLIBS)
-	$(LINK) repl.o whatnowproc.o annosbr.o $(LINKLIBS)
+repl: repl.o whatnowproc.o $(LOCALLIBS)
+	$(LINK) repl.o whatnowproc.o $(LINKLIBS)
 
 rmf: rmf.o $(LOCALLIBS)
 	$(LINK) rmf.o $(LINKLIBS)
@@ -205,17 +208,14 @@ send: send.o distsbr.o $(LOCALLIBS)
 	$(LINK) send.o distsbr.o $(LINKLIBS)
 
 sendfiles: sendfiles.sh
-	cp sendfiles.sh sendfiles
+	cp $(srcdir)/sendfiles.sh sendfiles
 	chmod +x sendfiles
 
 show: show.o $(LOCALLIBS)
 	$(LINK) show.o $(LINKLIBS)
 
-slocal.o: slocal.c
-	$(COMPILE2) $(srcdir)/slocal.c
-
-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)
@@ -223,8 +223,8 @@ sortm: sortm.o $(LOCALLIBS)
 spost: spost.o aliasbr.o $(LOCALLIBS)
 	$(LINK) spost.o aliasbr.o $(LINKLIBS)
 
-whatnow: whatnow.o annosbr.o $(LOCALLIBS)
-	$(LINK) whatnow.o annosbr.o $(LINKLIBS)
+whatnow: whatnow.o $(LOCALLIBS)
+	$(LINK) whatnow.o $(LINKLIBS)
 
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
@@ -233,7 +233,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
@@ -257,7 +257,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
@@ -312,7 +312,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); \