X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2FMakefile.in;h=88b9bd75ef9cfbd06729a95f00fdf9b3bc873047;hb=3df5ab3c116e6d4a2fb4bb5cc9dfc5f781825815;hp=58a82af41d27845596fd071eccd603c454d317ec;hpb=4e38095f027a81c005a48a888d0f8937e98543a5;p=mmh

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 58a82af..88b9bd7 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -17,14 +17,12 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
+CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"'
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-MTSLIB   =
-# ../mts/libmts.a
-NDBM_LIBS = @NDBM_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a
+LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a
 LINKLIBS = $(LOCALLIBS) $(LIBS)
 
 LINT    = @LINT@
@@ -34,6 +32,7 @@ TERMLIB = @TERMLIB@
 LEXLIB  = @LEXLIB@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 LINK    = $(CC) $(LDFLAGS) -o $@
 LN = ln
 
@@ -76,7 +75,7 @@ SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.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 \
-	whatnow.c whatnowproc.c whatnowsbr.c
+	whatnow.c whatnowproc.c
 
 # auxiliary files
 AUX = Makefile.in
@@ -102,14 +101,14 @@ anno: anno.o annosbr.o $(LOCALLIBS)
 burst: burst.o $(LOCALLIBS)
 	$(LINK) burst.o $(LINKLIBS)
 
-comp: comp.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) comp.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+comp: comp.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
+	$(LINK) comp.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
 
 conflict: conflict.o aliasbr.o $(LOCALLIBS)
 	$(LINK) conflict.o aliasbr.o $(LINKLIBS)
 
-dist: dist.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) dist.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+dist: dist.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
+	$(LINK) dist.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
 
 dp: dp.o termsbr.o $(LOCALLIBS)
 	$(LINK) dp.o termsbr.o $(LINKLIBS) $(TERMLIB)
@@ -123,8 +122,8 @@ fmtdump: fmtdump.o $(LOCALLIBS)
 folder: folder.o $(LOCALLIBS)
 	$(LINK) folder.o $(LINKLIBS)
 
-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)
+forw: forw.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
+	$(LINK) forw.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
 
 inc: inc.o scansbr.o dropsbr.o termsbr.o $(LOCALLIBS)
 	$(LINK) inc.o scansbr.o dropsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
@@ -193,8 +192,8 @@ rcvtty: rcvtty.o scansbr.o termsbr.o $(LOCALLIBS)
 refile: refile.o $(LOCALLIBS)
 	$(LINK) refile.o $(LINKLIBS)
 
-repl: repl.o replsbr.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) repl.o replsbr.o whatnowproc.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+repl: repl.o replsbr.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
+	$(LINK) repl.o replsbr.o whatnowproc.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
 
 rmf: rmf.o $(LOCALLIBS)
 	$(LINK) rmf.o $(LINKLIBS)
@@ -211,8 +210,11 @@ send: send.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
 show: show.o mhlsbr.o termsbr.o $(LOCALLIBS)
 	$(LINK) show.o mhlsbr.o termsbr.o $(LINKLIBS) $(TERMLIB)
 
+slocal.o: slocal.c
+	$(COMPILE2) $(srcdir)/slocal.c
+
 slocal: slocal.o aliasbr.o dropsbr.o $(LOCALLIBS)
-	$(LINK) slocal.o aliasbr.o dropsbr.o $(NDBM_LIBS) $(LINKLIBS)
+	$(LINK) slocal.o aliasbr.o dropsbr.o $(LINKLIBS)
 
 sortm: sortm.o $(LOCALLIBS)
 	$(LINK) sortm.o $(LINKLIBS)
@@ -223,8 +225,8 @@ 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)
 
-whatnow: whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS)
-	$(LINK) whatnow.o whatnowsbr.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS)
+whatnow: whatnow.o annosbr.o distsbr.o $(LOCALLIBS)
+	$(LINK) whatnow.o annosbr.o distsbr.o $(LINKLIBS)
 
 # ========== DEPENDENCIES FOR INSTALLING ==========