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

diff --git a/uip/Makefile.in b/uip/Makefile.in
index bf23531..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$(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
 
@@ -51,10 +54,10 @@ 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 whom
+       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 mmhwrap
@@ -71,15 +74,9 @@ SRCS = ali.c aliasbr.c anno.c ap.c burst.c comp.c \
 	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 \
+	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
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(AUX)
+	whatnow.c whatnowproc.c whom.c whatnow2.sh
 
 # ========== DEFAULT TARGET ==========
 
@@ -135,7 +132,7 @@ mmhwrap: mmhwrap.sh
 	chmod +x mmhwrap
 
 mhsign: mhsign.sh
-	cp $(srcdir)/mhsign.sh mhsign
+	sed "s,%libdir%,"$(libdir)"," $(srcdir)/mhsign.sh >mhsign
 	chmod +x mhsign
 
 mhpgp: mhpgp.sh
@@ -175,8 +172,8 @@ 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 $(srcdir)/print-mimetype.sh print-mimetype
@@ -206,9 +203,6 @@ 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)
 
@@ -228,6 +222,9 @@ spost: spost.o aliasbr.o $(LOCALLIBS)
 whatnow: whatnow.o $(LOCALLIBS)
 	$(LINK) whatnow.o $(LINKLIBS)
 
+whatnow2: whatnow2.sh
+	cp $(srcdir)/whatnow2.sh whatnow2
+
 whom: whom.o $(LOCALLIBS)
 	$(LINK) whom.o $(LINKLIBS)
 
@@ -244,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
@@ -252,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
@@ -259,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:
@@ -316,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
-