X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=f037ec138822d08fe3040043b31f8f3b5cd72459;hp=6b1469f342792647d86187f2712e3b2c029702b8;hb=c5368b86d4a3a42f9efe8aa56374d953a7faa9a4;hpb=4c1efddfd499300c7e74263e57d8aa137e84c853 diff --git a/uip/Makefile.in b/uip/Makefile.in index 6b1469f..f037ec1 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 @@ -48,16 +51,16 @@ 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 send sendfiles show slocal sortm spost whatnow 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 +MISC = ap dp fmtdump mhtest mmhwrap whatnow2 # commands with 'S'pecial installation needs SCMDS = inc @@ -66,20 +69,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 \ + 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 - -# 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 ========== @@ -134,8 +131,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,17 +166,14 @@ 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) 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 @@ -201,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) @@ -223,6 +222,12 @@ 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) + # ========== DEPENDENCIES FOR INSTALLING ========== # install everything @@ -236,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 @@ -244,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 @@ -251,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: @@ -308,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 -