X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=6b7a570a44d830face383943f772da61e2faec97;hp=6b1469f342792647d86187f2712e3b2c029702b8;hb=bd02210b2be64956a952f925a2dcd35fb42f6136;hpb=4c1efddfd499300c7e74263e57d8aa137e84c853

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 6b1469f..6b7a570 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,11 +17,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@
@@ -48,10 +49,10 @@ SETGID_MAIL    = @SETGID_MAIL@
 
 # commands to build
 CMDS = ali anno burst comp dist flist folder forw mmh mark \
-       mhbuild mhl \
-       mhlist mhmail mhparam mhpath mhstore msgchk new packf pick \
+       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 scan send sendfiles show slocal sortm spost whatnow whom
 
 # commands that are links to other commands
 LCMDS = flists folders next prev fnext fprev unseen
@@ -66,20 +67,14 @@ SCMDS = inc
 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 \
+	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 mhtest.c \
-	msgchk.c new.c packf.c pick.c print-mimetype.sh \
+	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 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)
+	whatnow.c whatnowproc.c whom.c
 
 # ========== DEFAULT TARGET ==========
 
@@ -134,8 +129,16 @@ mmhwrap: mmhwrap.sh
 	sed "s,%bindir%,"$(bindir)"," $(srcdir)/mmhwrap.sh >mmhwrap
 	chmod +x mmhwrap
 
-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)
+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)
@@ -161,9 +164,6 @@ mhstore: mhstore.o mhparse.o mhshowsbr.o mhlistsbr.o mhmisc.o mhfree.o termsbr.o
 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)
-
 new: new.o $(LOCALLIBS)
 	$(LINK) new.o $(LINKLIBS)
 
@@ -223,6 +223,9 @@ spost: spost.o aliasbr.o $(LOCALLIBS)
 whatnow: whatnow.o $(LOCALLIBS)
 	$(LINK) whatnow.o $(LINKLIBS)
 
+whom: whom.o $(LOCALLIBS)
+	$(LINK) whom.o $(LINKLIBS)
+
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install everything
@@ -308,10 +311,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
-