Ken Hornstein's SASL patch was not integrated properly with Ruud's new merged

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 2a21bd7..ff9fa56 100644 (file)
--- 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/smtp/libsmtp.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 ../zotnet/libzot.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 $@
@@ -52,9 +58,9 @@ SETGID_MAIL    = @SETGID_MAIL@
 
 # commands to build
 CMDS = ali anno burst comp dist flist folder forw mark mhbuild \
-       mhlist mhmail mhn mhparam mhpath mhshow mhstore mhtest msgchk \
+       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
@@ -64,7 +70,7 @@ LCMDS = flists folders next prev
 
 # misc support binaries
 MISC = ap conflict dp fmtdump install-mh mhl post rcvdist rcvpack \
-       rcvstore rcvtty slocal spost
+       rcvstore rcvtty slocal spost viamail mhtest
 
 # commands with 'S'pecial installation needs
 SCMDS = inc
@@ -76,7 +82,7 @@ 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 \
+       pick.c picksbr.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 \
@@ -273,7 +279,7 @@ install-misc:
 
 # install commands with special installation needs (thus no $(SCMDS) use here)
 install-scmds:
-       if test x$(SETGID_MAIL) = x1; then \
+       if test x$(SETGID_MAIL) != x; then \
          $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(bindir)/$$cmd; \
        else \
          $(INSTALL_PROGRAM)                 inc $(bindir)/$$cmd; \
@@ -308,6 +314,11 @@ realclean: distclean
 
 superclean: realclean
 
+# ========== DEPENDENCIES FOR LINT  ================
+
+lint: 
+       $(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
+
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 subdir = uip