X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2FMakefile.in;h=2423185719fe94d571c9225deaf79c550777ba50;hp=1e1ae9b986630eb187e2cbe70c923f05b6a231aa;hb=916690191222433a6923a4be54b0d8f6ac01bd02;hpb=788c353a8bee07520ae1a1de6fb7bdcdf1f4f1c7

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 1e1ae9b..2423185 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for uip subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -19,27 +17,21 @@ 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@
+MTSLIB   = 
+# ../mts/libmts.a
 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 $@
@@ -60,17 +52,14 @@ 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 new packf pick prompter refile repl rmf rmm scan send show \
+       new packf pick prompter refile repl rmf rmm scan send show \
        sortm whatnow whom
 
-## removed this from CMDS until I can fix it
-## OTHERCMDS = vmh
-
 # commands that are links to other commands
 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
@@ -83,12 +72,12 @@ 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 new.c packf.c pick.c picksbr.c popsbr.c \
-	post.c prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c	  \
+	msgchk.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	  \
-	whom.c wmh.c
+	whatnow.c whatnowproc.c whatnowsbr.c	  \
+	whom.c
 
 # auxiliary files
 AUX = Makefile.in
@@ -138,8 +127,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)
@@ -177,11 +166,8 @@ 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)
-
-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)
+msgchk: msgchk.o $(LOCALLIBS)
+	$(LINK) msgchk.o $(LINKLIBS)
 
 new: new.o $(LOCALLIBS)
 	$(LINK) new.o $(LINKLIBS)
@@ -192,9 +178,6 @@ packf: packf.o dropsbr.o $(LOCALLIBS)
 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)
 
@@ -243,9 +226,6 @@ spost: spost.o aliasbr.o $(LOCALLIBS)
 viamail: viamail.o mhmisc.o mhoutsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
 	$(LINK) viamail.o mhmisc.o mhoutsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS) $(TERMLIB)
 
-vmh: vmh.o vmhsbr.o $(LOCALLIBS)
-	$(LINK) vmh.o vmhsbr.o $(LINKLIBS) $(TERMLIB)
-
 whatnow: whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
 	$(LINK) whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)