Removed the suppress dups feature from slocal for simplicity reasons.

[mmh] / uip / Makefile.in

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 58a82af..6254ee9 100644 (file)
--- 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
 
@@ -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)