From: Ted Lemon <source@isc.org>
Date: Tue, 20 Jun 2000 20:29:16 +0000 (+0000)
Subject: Fix depend target.   Don't echo building of links.
X-Git-Tag: V3-BETA-2-PATCH-1~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88dd0d2083f12d4748b56f47b2c054b0411ab4c7;p=thirdparty%2Fdhcp.git

Fix depend target.   Don't echo building of links.
---

diff --git a/minires/Makefile.dist b/minires/Makefile.dist
index 842c3a8cb..c0525f19a 100644
--- a/minires/Makefile.dist
+++ b/minires/Makefile.dist
@@ -19,6 +19,7 @@
 
 CATMANPAGES = dhcpctl.cat3
 SEDMANPAGES = dhcpctl.man3
+MAN    = dhcpctl.3
 SRC    = res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c \
 	 res_sendsigned.c res_findzonecut.c res_query.c res_mkquery.c \
 	 ns_date.c ns_parse.c ns_sign.c ns_name.c ns_samedomain.c ns_verify.c \
@@ -27,9 +28,10 @@ OBJ    = res_mkupdate.o res_init.o res_update.o res_send.o res_comp.o \
 	 res_sendsigned.o res_findzonecut.o res_query.o res_mkquery.o \
 	 ns_date.o ns_parse.o ns_sign.o ns_name.o ns_samedomain.o ns_verify.o \
 	 dst_api.o hmac_link.o md5_dgst.o prandom.o support.o base64.o
+HDRS   = dst_internal.h md5.h md5_locl.h
 
 DEBUG  = -g
-INCLUDES = $(BINDINC) -I../includes
+INCLUDES = $(BINDINC) -I$(TOP)/includes
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHMAC_MD5 -DMINIRES_LIB
 
 all:	libres.a
@@ -42,7 +44,7 @@ libres.a:	$(OBJ)
 	$(RANLIB) libres.a
 
 depend:
-	mkdep $(INCLUDES) $(PREDEFINES) $(SRC)
+	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
 
 clean:
 	-rm -f $(OBJ) libres.a
@@ -53,6 +55,14 @@ realclean: clean
 distclean: realclean
 	-rm -f Makefile
 
+links:
+	@for foo in $(SRC) $(MAN) $(HDRS); do \
+	  if [ ! -b $$foo ]; then \
+	    rm -f $$foo; \
+	  fi; \
+	  ln -s $(TOP)/minires/$$foo $$foo; \
+	done
+
 dhcpctl.cat3:	dhcpctl.man3
 	nroff -man dhcpctl.man3 >dhcpctl.cat3
 
diff --git a/omapip/Makefile.dist b/omapip/Makefile.dist
index 810a385bd..544fa04e8 100644
--- a/omapip/Makefile.dist
+++ b/omapip/Makefile.dist
@@ -26,7 +26,7 @@ OBJ    = protocol.o buffer.o alloc.o result.o connection.o errwarn.o \
 MAN    = omapi.3
 
 DEBUG  = -g
-INCLUDES = $(BINDINC) -I../includes
+INCLUDES = $(BINDINC) -I$(TOP)/includes
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:	libomapi.a test $(CATMANPAGES)
@@ -53,7 +53,7 @@ install: all
 	$(INSTALL) libomapi.a $(DESTDIR)$(LIBDIR)
 	$(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libomapi.a
 	for file in alloc.h buffer.h omapip.h; do \
-	  $(INSTALL) ../includes/omapip/$$file $(DESTDIR)$(INCDIR)/omapip; \
+	  $(INSTALL) $(TOP)/includes/omapip/$$file $(DESTDIR)$(INCDIR)/omapip; \
 	  $(CHMOD) 644 $(DESTDIR)$(INCDIR)/omapip/$$file; \
 	done
 	for man in $(MAN); do \
@@ -64,7 +64,7 @@ install: all
 	done
 
 depend:
-	mkdep $(INCLUDES) $(PREDEFINES) $(SRC)
+	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
 
 clean:
 	-rm -f $(OBJ) test.o test
@@ -75,6 +75,14 @@ realclean: clean
 distclean: realclean
 	-rm -f Makefile
 
+links:
+	@for foo in $(SRC) $(MAN) test.c; do \
+	  if [ ! -b $$foo ]; then \
+	    rm -f $$foo; \
+	  fi; \
+	  ln -s $(TOP)/omapip/$$foo $$foo; \
+	done
+
 omapi.cat3:	omapi.man3
 	nroff -man omapi.man3 >omapi.cat3
 
diff --git a/relay/Makefile.dist b/relay/Makefile.dist
index ed8ff8615..39e64f25f 100644
--- a/relay/Makefile.dist
+++ b/relay/Makefile.dist
@@ -25,7 +25,7 @@ PROG   = dhcrelay
 MAN    = dhcrelay.8
 
 DEBUG  = -g
-INCLUDES = -I.. $(BINDINC) -I../includes
+INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
 DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
@@ -48,7 +48,7 @@ install: all
 				$(DESTDIR)$(ADMMANDIR)/dhcrelay$(ADMMANEXT)
 
 depend:
-	mkdep $(INCLUDES) $(PREDEFINES) $(SRCS)
+	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
 
 clean:
 	-rm -f $(OBJS) dhclient.o
@@ -59,6 +59,14 @@ realclean: clean
 distclean: realclean
 	-rm -f Makefile
 
+links:
+	@for foo in $(SRCS) $(MAN); do \
+	  if [ ! -b $$foo ]; then \
+	    rm -f $$foo; \
+	  fi; \
+	  ln -s $(TOP)/relay/$$foo $$foo; \
+	done
+
 # These should only be done on 4.4 BSD-based systems, since the mandoc
 # macros aren't available on older unices.   Catted man pages are
 # provided in the distribution so that this doesn't become a problem.
diff --git a/server/Makefile.dist b/server/Makefile.dist
index 3ed7d2257..f49b83af6 100644
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -27,7 +27,7 @@ PROG   = dhcpd
 MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 
 DEBUG  = -g
-INCLUDES = -I.. $(BINDINC) -I../includes
+INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
 DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIB)
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
@@ -54,7 +54,7 @@ install: all
 			$(DESTDIR)$(FFMANDIR)/dhcpd.leases$(FFMANEXT)
 
 depend:
-	mkdep $(INCLUDES) $(PREDEFINES) $(SRCS)
+	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
 
 clean:
 	-rm -f $(OBJS)
@@ -65,6 +65,14 @@ realclean: clean
 distclean: realclean
 	-rm -f Makefile
 
+links:
+	@for foo in $(SRCS) $(MAN); do \
+	  if [ ! -b $$foo ]; then \
+	    rm -f $$foo; \
+	  fi; \
+	  ln -s $(TOP)/server/$$foo $$foo; \
+	done
+
 # These should only be done on 4.4 BSD-based systems, since the mandoc
 # macros aren't available on older unices.   Catted man pages are
 # provided in the distribution so that this doesn't become a problem.