Various cleanups I made while going through Erik Hovland's patch submissions,

[oweals/busybox.git] / networking / udhcp / Makefile.in

diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in
index 8573a2fc4ed321c7aec2eb18013020faa5969e4b..77c4b720a9080bddebd217b0f1a853d38a3a22bd 100644 (file)
--- a/networking/udhcp/Makefile.in
+++ b/networking/udhcp/Makefile.in
@@ -12,10 +12,10 @@ endif
 srcdir=$(top_srcdir)/networking/udhcp
 
 #ok, so I forgot how to do an or, but this is a quick and dirty hack
-ifeq ($(strip $(CONFIG_UDHCPC)),y)
+ifeq ($(strip $(CONFIG_APP_UDHCPC)),y)
 CONFIG_UDHCP_SHARED=y
 else
-ifeq ($(strip $(CONFIG_UDHCPD)),y)
+ifeq ($(strip $(CONFIG_APP_UDHCPD)),y)
 CONFIG_UDHCP_SHARED=y
 else
 CONFIG_UDHCP_SHARED=n
@@ -25,14 +25,16 @@ endif
 UDHCP-y:=
 UDHCP-$(CONFIG_UDHCP_SHARED)    += common.c options.c packet.c pidfile.c \
                                   signalpipe.c socket.c
-UDHCP-$(CONFIG_UDHCPC)         += dhcpc.c clientpacket.c clientsocket.c \
+UDHCP-$(CONFIG_APP_UDHCPC)     += dhcpc.c clientpacket.c clientsocket.c \
                                   script.c
-UDHCP-$(CONFIG_UDHCPD)         += dhcpd.c arpping.c files.c leases.c \
+UDHCP-$(CONFIG_APP_UDHCPD)     += dhcpd.c arpping.c files.c leases.c \
                                   serverpacket.c static_leases.c
-UDHCP-$(CONFIG_DUMPLEASES)     += dumpleases.c
+UDHCP-$(CONFIG_APP_DUMPLEASES) += dumpleases.c
 UDHCP_OBJS:=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y))
 
+ifneq ($(strip $(UDHCP-y)),)
 libraries-y+=$(UDHCP_DIR)$(UDHCP_AR)
+endif
 
 UDHCP-y:=$(patsubst %,$(srcdir)/%,$(UDHCP-y))
 UDHCP-a:=$(wildcard $(srcdir)/*.c)
@@ -45,8 +47,7 @@ APPLETS_DEFINE-y+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES)
 APPLETS_DEFINE-a+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES)
 
 $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS)
-       $(AR) $(ARFLAGS) $@ $(UDHCP_OBJS)
+       $(do_ar)
 
 $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DIN_BUSYBOX -c $< -o $@
-
+       $(compile.c) -DIN_BUSYBOX