X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=6bdd4ebaee98440462589d14c3c329cc6a1da9e2;hp=71fd13b9825631ca32dc87492358975b39a8df00;hb=4885712264980e6cbc2039f9158027bee9213475;hpb=b9b7473dc3c3931475d3dacbe827db62731bce4c

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 71fd13b..6bdd4eb 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -20,19 +20,25 @@ CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
 HESIOD_INCLUDES = @HESIOD_INCLUDES@
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES)
+SASL_INCLUDES = @SASL_INCLUDES@
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES) $(SASL_INCLUDES)
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-MTSLIB   = @MTSLIB@
+MTSLIB   = ../mts/libmts.a
 KRB4_LIBS = @KRB4_LIBS@
+SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a ../$(MTSLIB) ../zotnet/libzot.a
-LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(HESIOD_LIBS) $(LIBS)
+LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
+LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
+
+LINT	= @LINT@
+LINTFLAGS = @LINTFLAGS@
 
 TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
-POPLIB  = @POPLIB@
+APOPLIB = @APOPLIB@
+POPLIB  = @POPLIB@ $(APOPLIB)
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
@@ -41,7 +47,8 @@ LN = ln
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 
-SETGID_MAIL = @SETGID_MAIL@
+MAIL_SPOOL_GRP = @MAIL_SPOOL_GRP@
+SETGID_MAIL    = @SETGID_MAIL@
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -50,10 +57,10 @@ SETGID_MAIL = @SETGID_MAIL@
 	$(COMPILE) $<
 
 # commands to build
-CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
-       mhlist mhmail mhn mhparam mhpath mhshow mhstore mhtest msgchk \
+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 \
-       sortm viamail whatnow whom
+       sortm whatnow whom
 
 ## removed this from CMDS until I can fix it
 ## OTHERCMDS = vmh
@@ -62,24 +69,25 @@ CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
 LCMDS = flists folders next prev
 
 # misc support binaries
-MISC = ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack \
-       rcvstore rcvtty slocal spost
+MISC = ap conflict dp fmtdump mhl post rcvdist rcvpack \
+       rcvstore rcvtty slocal spost viamail mhtest
 
 # 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 ftpsbr.c inc.c install-mh.c mark.c md5.c mhbuild.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 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 whom.c wmh.c
+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 ftpsbr.c inc.c install-mh.c mark.c md5.c mhbuild.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	  \
+	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	  \
+	whom.c wmh.c
 
 # auxiliary files
 AUX = Makefile.in
@@ -243,7 +251,7 @@ whom: whom.o distsbr.o $(LOCALLIBS)
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install everything
-install: install-cmds install-lcmds install-misc install-scmds
+install: install-cmds install-misc install-lcmds install-scmds
 
 # install commands
 install-cmds:
@@ -258,10 +266,12 @@ install-lcmds:
 	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
 
 # install misc support binaries
 install-misc:
@@ -272,8 +282,8 @@ install-misc:
 
 # install commands with special installation needs (thus no $(SCMDS) use here)
 install-scmds:
-	if test x$(SETGID_MAIL) = x1; then \
-	  $(INSTALL_PROGRAM) -g mail -m 2755 inc $(bindir)/$$cmd; \
+	if test x$(SETGID_MAIL) != x; then \
+	  $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
 	else \
 	  $(INSTALL_PROGRAM)                 inc $(bindir)/$$cmd; \
 	fi
@@ -307,6 +317,11 @@ realclean: distclean
 
 superclean: realclean
 
+# ========== DEPENDENCIES FOR LINT  ================
+
+lint: 
+	$(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
+
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 subdir = uip