[openap-cvs] : udhcp Makefile,1.2,1.3 udhcpc.script,1.1,NONE

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/udhcp
In directory subversions:/tmp/cvs-serv13752

Modified Files:
        Makefile 
Removed Files:
        udhcpc.script 
Log Message:
make it easier to optionally include server and/or client, remove cruft


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/udhcp/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile    8 May 2002 04:45:21 -0000       1.2
+++ Makefile    20 May 2002 00:42:10 -0000      1.3
@@ -1,20 +1,28 @@
 # udhcp makefile
 
+include ../.config
+
 prefix=$(IMAGE_DIR)/usr
 SBINDIR=$(IMAGE_DIR)/sbin
+ETCDIR=$(IMAGE_DIR)/etc/
 USRSBINDIR=${prefix}/sbin
 USRBINDIR=${prefix}/bin
 USRSHAREDIR=${prefix}/share
 
 # Uncomment this to get a shared binary. Call as udhcpd for the server,
 # and udhcpc for the client
-# COMBINED_BINARY=1
+ifeq ($(CONFIG_UDHCPC),y)
+ifeq ($(CONFIG_UDHCPD),y)
+COMBINED_BINARY=yes
+endif
+endif
 
 # Uncomment this for extra output and to compile with debugging symbols
-# DEBUG=1
+#DEBUG=1
 
 # Uncomment this to output messages to syslog, otherwise, messages go to stdout
-#CFLAGS += -DSYSLOG
+# CFLAGS += -DSYSLOG
+LDFLAGS=--static
 
 #CROSS_COMPILE=arm-uclibc-
 CC = $(CROSS_COMPILE)gcc
@@ -23,7 +31,7 @@
 
 VER := 0.9.6
 
-LDFLAGS=--static
+
 OBJS_SHARED = options.o socket.o packet.o pidfile.o
 DHCPD_OBJS = dhcpd.o arpping.o files.o leases.o serverpacket.o
 DHCPC_OBJS = dhcpc.o clientpacket.o script.o
@@ -43,6 +51,7 @@
 EXEC3 = dumpleases
 OBJS3 = dumpleases.o
 
+BOOT_PROGRAMS = udhcpc
 DAEMONS = udhcpd
 COMMANDS = dumpleases
 
@@ -78,9 +87,31 @@
 
 
 install: all
-       $(INSTALL) -s udhcpc $(SBINDIR)
+ifeq ($(CONFIG_UDHCPD),y)
+       mkdir -p $(USRSBINDIR)
+       $(INSTALL) -s $(DAEMONS) $(USRSBINDIR)
+       mkdir -p $(ETCDIR)/init.d
+       mkdir -p $(ETCDIR)/rc1.d
+       mkdir -p $(ETCDIR)/rc3.d
+       $(INSTALL) samples/udhcpd.conf $(ETCDIR)
+       $(INSTALL) udhcpd.init $(ETCDIR)/init.d/udhcpd
+       ln -s ../init.d/udhcpd $(ETCDIR)/rc1.d/K50udhcpd
+       ln -s ../init.d/udhcpd $(ETCDIR)/rc3.d/S50udhcpd
+
+endif
+ifeq ($(CONFIG_UDHCPC),y)
+       mkdir -p $(SBINDIR)
+ifdef COMBINED_BINARY
+       ln -sf /usr/sbin/udhcpd $(SBINDIR)/$(BOOT_PROGRAMS)
+else
+       $(INSTALL) -s $(BOOT_PROGRAMS) $(SBINDIR)
+endif
        mkdir -p $(USRSHAREDIR)/udhcpc
-       $(INSTALL) udhcpc.script $(USRSHAREDIR)/udhcpc/default.script
+       for name in script ; do \
+               $(INSTALL) samples/sample.$$name \
+                       $(USRSHAREDIR)/udhcpc/default.$$name ; \
+       done
+endif
 
 clean:
        -rm -f udhcpd udhcpc dumpleases *.o core

--- udhcpc.script DELETED ---