summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2002-12-11 22:45:33 +0000
committerEric Andersen2002-12-11 22:45:33 +0000
commit1f1c3f94853c4402bdf6b1996da8f920efc96779 (patch)
tree1f42c6c29a8b0f01b17e8697db6e8ad77a782555
parent54fde9ea5c114b57a059dc55c7cf7e7118fadb92 (diff)
downloadbusybox-1f1c3f94853c4402bdf6b1996da8f920efc96779.zip
busybox-1f1c3f94853c4402bdf6b1996da8f920efc96779.tar.gz
Makefile rework coordinate with Russ so udhcp will behave
-Erik
-rw-r--r--networking/udhcp/Makefile.in24
1 files changed, 9 insertions, 15 deletions
diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in
index 2cba962..b595e58 100644
--- a/networking/udhcp/Makefile.in
+++ b/networking/udhcp/Makefile.in
@@ -34,22 +34,16 @@ endif
endif
UDHCP-y:=
-UDHCP-$(CONFIG_UDHCP_SHARED) += options.o socket.o packet.o pidfile.o
-UDHCP-$(CONFIG_UDHCPC) += dhcpc.o clientpacket.o script.o
-UDHCP-$(CONFIG_UDHCPD) += dhcpd.o arpping.o files.o leases.o serverpacket.o
-UDHCP-$(CONFIG_DUMPLEASES) += dumpleases.o
+UDHCP-$(CONFIG_UDHCP_SHARED) += options.c socket.c packet.c pidfile.c
+UDHCP-$(CONFIG_UDHCPC) += dhcpc.c clientpacket.c script.c
+UDHCP-$(CONFIG_UDHCPD) += dhcpd.c arpping.c files.c leases.c serverpacket.c
+UDHCP-$(CONFIG_DUMPLEASES) += dumpleases.c
+UDHCP_OBJS=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y))
libraries-y+=$(UDHCP_DIR)$(UDHCP_AR)
-$(UDHCP_DIR)$(UDHCP_AR): $(patsubst %,$(UDHCP_DIR)%, $(UDHCP-y))
- $(AR) -ro $@ $(patsubst %,$(UDHCP_DIR)%, $(UDHCP-y))
-
-$(UDHCP_DIR)dhcpc.o: $(UDHCP_DIR)dhcpc.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DCOMBINED_BINARY -c $< -o $@
-
-$(UDHCP_DIR)dhcpd.o: $(UDHCP_DIR)dhcpd.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DCOMBINED_BINARY -c $< -o $@
-
-$(UDHCP_DIR)dumpleases.o: $(UDHCP_DIR)dumpleases.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DCOMBINED_BINARY -c $< -o $@
+$(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS)
+ $(AR) -ro $@ $(UDHCP_OBJS)
+$(UDHCP_OBJS): $(patsubst %,$(UDHCP_DIR)%, $(UDHCP-y))
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DIN_BUSYBOX -c $< -o $@