X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=691bfe6f4d76328c99818b7fbee94c171a7d5dab;hp=a711a9206ff34b03107f3264a0e9b1dcf25467fc;hb=ab7b48411962d26439f92f35ed084d3d6275459c;hpb=35c228531bc8e00d43be590255df9408a4fcbe19 diff --git a/uip/Makefile.in b/uip/Makefile.in index a711a92..691bfe6 100644 --- a/uip/Makefile.in +++ b/uip/Makefile.in @@ -1,8 +1,6 @@ # # Makefile for uip subdirectory # -# $Id$ -# SHELL = /bin/sh @@ -19,26 +17,20 @@ etcdir = @sysconfdir@ CC = @CC@ CFLAGS = @CFLAGS@ DEFS = @DEFS@ -HESIOD_INCLUDES = @HESIOD_INCLUDES@ -SASL_INCLUDES = @SASL_INCLUDES@ -INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES) $(SASL_INCLUDES) +INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ MTSLIB = ../mts/libmts.a -KRB4_LIBS = @KRB4_LIBS@ -SASL_LIBS = @SASL_LIBS@ -HESIOD_LIBS = @HESIOD_LIBS@ +NDBM_LIBS = @NDBM_LIBS@ LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a -LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS) +LINKLIBS = $(LOCALLIBS) $(LIBS) LINT = @LINT@ LINTFLAGS = @LINTFLAGS@ TERMLIB = @TERMLIB@ LEXLIB = @LEXLIB@ -APOPLIB = @APOPLIB@ -POPLIB = @POPLIB@ $(APOPLIB) COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS) LINK = $(CC) $(LDFLAGS) -o $@ @@ -59,7 +51,7 @@ SETGID_MAIL = @SETGID_MAIL@ # commands to build CMDS = ali anno burst comp dist flist folder forw install-mh mark mhbuild \ mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk \ - msh packf pick prompter refile repl rmf rmm scan send show \ + msh new packf pick prompter refile repl rmf rmm scan send show \ sortm whatnow whom ## removed this from CMDS until I can fix it @@ -69,7 +61,7 @@ CMDS = ali anno burst comp dist flist folder forw install-mh mark mhbuild \ LCMDS = flists folders next prev # misc support binaries -MISC = ap conflict dp fmtdump mhl post rcvdist rcvpack \ +MISC = ap conflict dp fmtdump mhl rcvdist rcvpack \ rcvstore rcvtty slocal spost viamail mhtest # commands with 'S'pecial installation needs @@ -82,8 +74,8 @@ SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \ mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c \ mhlsbr.c mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c \ mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c \ - msgchk.c msh.c mshcmds.c packf.c pick.c picksbr.c popi.c popsbr.c \ - post.c prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c \ + msgchk.c msh.c mshcmds.c new.c packf.c pick.c picksbr.c \ + prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c \ refile.c repl.c replsbr.c rmf.c rmm.c scan.c scansbr.c send.c \ sendsbr.c show.c slocal.c sortm.c spost.c termsbr.c viamail.c \ vmh.c vmhsbr.c vmhtest.c whatnow.c whatnowproc.c whatnowsbr.c \ @@ -137,8 +129,8 @@ folder: folder.o $(LOCALLIBS) forw: forw.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS) $(LINK) forw.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS) -inc: inc.o scansbr.o dropsbr.o termsbr.o $(POPLIB) $(LOCALLIBS) - $(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(POPLIB) $(LINKLIBS) $(TERMLIB) +inc: inc.o scansbr.o dropsbr.o termsbr.o $(LOCALLIBS) + $(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(LINKLIBS) $(TERMLIB) install-mh: install-mh.o $(LOCALLIBS) $(LINK) install-mh.o $(LINKLIBS) @@ -146,8 +138,8 @@ install-mh: install-mh.o $(LOCALLIBS) mark: mark.o $(LOCALLIBS) $(LINK) mark.o $(LINKLIBS) -mhbuild: mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS) - $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o md5.o $(LINKLIBS) $(TERMLIB) +mhbuild: mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS) + $(LINK) mhbuild.o mhbuildsbr.o mhcachesbr.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o ftpsbr.o md5.o $(LINKLIBS) $(TERMLIB) mhl: mhl.o mhlsbr.o termsbr.o $(LOCALLIBS) $(LINK) mhl.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB) @@ -176,21 +168,21 @@ mhstore: mhstore.o mhparse.o mhcachesbr.o mhshowsbr.o mhlistsbr.o mhstoresbr.o m mhtest: mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LOCALLIBS) $(LINK) mhtest.o mhparse.o mhcachesbr.o mhoutsbr.o mhmisc.o mhfree.o ftpsbr.o termsbr.o md5.o $(LINKLIBS) $(TERMLIB) -msgchk: msgchk.o $(POPLIB) $(LOCALLIBS) - $(LINK) msgchk.o $(POPLIB) $(LINKLIBS) +msgchk: msgchk.o $(LOCALLIBS) + $(LINK) msgchk.o $(LINKLIBS) msh: msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o $(LOCALLIBS) $(LINK) msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB) +new: new.o $(LOCALLIBS) + $(LINK) new.o $(LINKLIBS) + packf: packf.o dropsbr.o $(LOCALLIBS) $(LINK) packf.o dropsbr.o $(LINKLIBS) pick: pick.o picksbr.o $(LOCALLIBS) $(LINK) pick.o picksbr.o $(LINKLIBS) -post: post.o aliasbr.o $(LOCALLIBS) - $(LINK) post.o aliasbr.o $(LINKLIBS) - prompter: prompter.o $(LOCALLIBS) $(LINK) prompter.o $(LINKLIBS) @@ -228,7 +220,7 @@ show: show.o mhlsbr.o termsbr.o $(LOCALLIBS) $(LINK) show.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB) slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS) - $(LINK) slocal.o aliasbr.o dropsbr.o $(LINKLIBS) + $(LINK) slocal.o aliasbr.o dropsbr.o $(NDBM_LIBS) $(LINKLIBS) sortm: sortm.o $(LOCALLIBS) $(LINK) sortm.o $(LINKLIBS) @@ -255,51 +247,56 @@ install: install-cmds install-misc install-lcmds install-scmds # install commands install-cmds: - $(top_srcdir)/mkinstalldirs $(bindir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) for cmd in $(CMDS); do \ - $(INSTALL_PROGRAM) $$cmd $(bindir)/$$cmd; \ + $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \ done # install links install-lcmds: - rm -f $(bindir)/flists - rm -f $(bindir)/folders - rm -f $(bindir)/prev - rm -f $(bindir)/next - rm -f $(libdir)/install-mh - $(LN) $(bindir)/flist $(bindir)/flists - $(LN) $(bindir)/folder $(bindir)/folders - $(LN) $(bindir)/show $(bindir)/prev - $(LN) $(bindir)/show $(bindir)/next - $(LN) $(bindir)/install-mh $(libdir)/install-mh + rm -f $(DESTDIR)$(bindir)/flists + rm -f $(DESTDIR)$(bindir)/folders + rm -f $(DESTDIR)$(bindir)/fnext + rm -f $(DESTDIR)$(bindir)/fprev + rm -f $(DESTDIR)$(bindir)/unseen + rm -f $(DESTDIR)$(bindir)/prev + rm -f $(DESTDIR)$(bindir)/next + rm -f $(DESTDIR)$(libdir)/install-mh + $(LN) $(DESTDIR)$(bindir)/flist $(DESTDIR)$(bindir)/flists + $(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders + $(LN) $(DESTDIR)$(bindir)/new $(DESTDIR)$(bindir)/fnext + $(LN) $(DESTDIR)$(bindir)/new $(DESTDIR)$(bindir)/fprev + $(LN) $(DESTDIR)$(bindir)/new $(DESTDIR)$(bindir)/unseen + $(LN) $(DESTDIR)$(bindir)/show $(DESTDIR)$(bindir)/prev + $(LN) $(DESTDIR)$(bindir)/show $(DESTDIR)$(bindir)/next # install misc support binaries install-misc: - $(top_srcdir)/mkinstalldirs $(libdir) + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) for misc in $(MISC); do \ - $(INSTALL_PROGRAM) $$misc $(libdir)/$$misc; \ + $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \ done # install commands with special installation needs (thus no $(SCMDS) use here) install-scmds: if test x$(SETGID_MAIL) != x; then \ - $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \ + $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \ else \ - $(INSTALL_PROGRAM) inc $(bindir)/$$cmd; \ + $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd; \ fi uninstall: for cmd in $(CMDS); do \ - rm -f $(bindir)/$$cmd; \ + rm -f $(DESTDIR)$(bindir)/$$cmd; \ done for lcmd in $(LCMDS); do \ - rm -f $(bindir)/$$lcmd; \ + rm -f $(DESTDIR)$(bindir)/$$lcmd; \ done for misc in $(MISC); do \ - rm -f $(libdir)/$$misc; \ + rm -f $(DESTDIR)$(libdir)/$$misc; \ done for cmd in $(SCMDS); do \ - rm -f $(bindir)/$$cmd; \ + rm -f $(DESTDIR)$(bindir)/$$cmd; \ done # ========== DEPENDENCIES FOR CLEANUP ==========