X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=fcab14d73abb1c916632e0171adc9010b90a5401;hp=d81985f7fe9d64ee2b6747596f7fff992f5d4372;hb=93fa896ceb5fbebe2f1f6e6e36419a13f8ffd99f;hpb=cde17f8d38bf9306df4706ac2acb528a2a686a29

diff --git a/uip/Makefile.in b/uip/Makefile.in
index d81985f..fcab14d 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -8,6 +8,8 @@ top_srcdir = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
+VERSION = `$(top_srcdir)/version.sh $(top_srcdir)`
+
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 bindir      = @bindir@
@@ -17,11 +19,12 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
+# add include dir .. for config.h when building in different directory
+INCLUDES = -I$(srcdir) -I$(top_srcdir) -I.. @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a
+LOCALLIBS = ../sbr/libmh.a
 LINKLIBS = $(LOCALLIBS) $(LIBS)
 
 LINT    = @LINT@
@@ -30,7 +33,7 @@ LINTFLAGS = @LINTFLAGS@
 TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE = $(CC) -c $(DEFS) -DVERSION="\"$(VERSION)\"" $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
 LN = ln
 
@@ -47,39 +50,33 @@ SETGID_MAIL    = @SETGID_MAIL@
 	$(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp conflict dist flist folder forw mmh mark \
-       mhbuild mhl \
-       mhlist mhmail mhparam mhpath mhshow mhstore msgchk new packf pick \
+CMDS = ali anno burst comp dist flist folder forw mmh mark \
+       mhbuild mhl mhsign mhpgp \
+       mhlist mhmail mhparam mhpath mhstore new packf pick \
        print-mimetype prompter rcvdist rcvpack rcvstore refile repl rmf \
-       rmm scan send sendfiles show slocal sortm spost whatnow
+       rmm send sendfiles show slocal sortm spost whatnow whatnow2 whom
 
 # commands that are links to other commands
-LCMDS = flists folders next prev fnext fprev unseen
+LCMDS = flists folders next prev fnext fprev unseen scan
 
 # 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 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 mhbuild.c \
+	mhfree.c mhl.c mhlist.c mhlistsbr.c mhsign.sh mhpgp.sh \
 	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 print-mimetype.sh \
+	mhpath.c mhshow.c mhshowsbr.c mhstore.c mhtest.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
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
+	refile.c repl.c rmf.c rmm.c scansbr.c send.c \
+	sendfiles.sh slocal.c sortm.c spost.c termsbr.c \
+	whatnow.c whatnowproc.c whom.c whatnow2.sh
 
 # ========== DEFAULT TARGET ==========
 
@@ -93,8 +90,8 @@ ali: ali.o aliasbr.o $(LOCALLIBS)
 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)
@@ -102,9 +99,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)
 
@@ -120,27 +114,39 @@ 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)
 
+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)
+mhsign: mhsign.sh
+	sed "s,%libdir%,"$(libdir)"," $(srcdir)/mhsign.sh >mhsign
+	chmod +x mhsign
+
+mhpgp: mhpgp.sh
+	cp $(srcdir)/mhpgp.sh mhpgp
+	chmod +x mhpgp
+
+mhbuild: mhbuild.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o termsbr.o $(LOCALLIBS)
+	$(LINK) mhbuild.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,17 +157,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)
-
-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)
+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)
 
-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)
+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)
 
-msgchk: msgchk.o $(LOCALLIBS)
-	$(LINK) msgchk.o $(LINKLIBS)
+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)
 
 new: new.o $(LOCALLIBS)
 	$(LINK) new.o $(LINKLIBS)
@@ -169,11 +172,11 @@ new: new.o $(LOCALLIBS)
 packf: packf.o dropsbr.o $(LOCALLIBS)
 	$(LINK) packf.o dropsbr.o $(LINKLIBS)
 
-pick: pick.o $(LOCALLIBS)
-	$(LINK) pick.o $(LINKLIBS)
+pick: pick.o scansbr.o termsbr.o $(LOCALLIBS)
+	$(LINK) pick.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
 print-mimetype: print-mimetype.sh
-	cp print-mimetype.sh print-mimetype
+	cp $(srcdir)/print-mimetype.sh print-mimetype
 	chmod +x print-mimetype
 
 prompter: prompter.o $(LOCALLIBS)
@@ -191,8 +194,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)
@@ -200,19 +203,13 @@ rmf: rmf.o $(LOCALLIBS)
 rmm: rmm.o $(LOCALLIBS)
 	$(LINK) rmm.o $(LINKLIBS)
 
-scan: scan.o scansbr.o termsbr.o $(LOCALLIBS)
-	$(LINK) scan.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
-
 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: slocal.o $(LOCALLIBS)
 	$(LINK) slocal.o $(LINKLIBS)
 
@@ -222,8 +219,14 @@ 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)
+
+whatnow2: whatnow2.sh
+	cp $(srcdir)/whatnow2.sh whatnow2
+
+whom: whom.o $(LOCALLIBS)
+	$(LINK) whom.o $(LINKLIBS)
 
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
@@ -238,7 +241,7 @@ install-cmds:
 	done
 
 # install links
-install-lcmds:
+install-lcmds: install-cmds
 	rm -f $(DESTDIR)$(bindir)/flists
 	rm -f $(DESTDIR)$(bindir)/folders
 	rm -f $(DESTDIR)$(bindir)/fnext
@@ -246,6 +249,7 @@ install-lcmds:
 	rm -f $(DESTDIR)$(bindir)/unseen
 	rm -f $(DESTDIR)$(bindir)/prev
 	rm -f $(DESTDIR)$(bindir)/next
+	rm -f $(DESTDIR)$(bindir)/scan
 	$(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
 	$(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
 	$(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/fnext
@@ -253,6 +257,7 @@ install-lcmds:
 	$(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/unseen
 	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
 	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/next
+	$(LN) $(DESTDIR)$(bindir)/pick   $(DESTDIR)$(bindir)/scan
 
 # install misc support binaries
 install-misc:
@@ -310,10 +315,3 @@ subdir = uip
 Makefile: Makefile.in ../config.status
 	cd .. && ./config.status $(subdir)/$@
 
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
-