diff options
Diffstat (limited to 'networking/udhcp')
| -rw-r--r-- | networking/udhcp/Config.in | 18 | ||||
| -rw-r--r-- | networking/udhcp/Kbuild | 17 | ||||
| -rw-r--r-- | networking/udhcp/Makefile | 23 | ||||
| -rw-r--r-- | networking/udhcp/Makefile.in | 53 |
4 files changed, 26 insertions, 85 deletions
diff --git a/networking/udhcp/Config.in b/networking/udhcp/Config.in index f013401..13dbcee 100644 --- a/networking/udhcp/Config.in +++ b/networking/udhcp/Config.in @@ -3,7 +3,7 @@ # see scripts/kbuild/config-language.txt. # -config CONFIG_APP_UDHCPD +config APP_UDHCPD bool "udhcp Server (udhcpd)" default n help @@ -12,10 +12,10 @@ config CONFIG_APP_UDHCPD See http://udhcp.busybox.net for further details. -config CONFIG_APP_DUMPLEASES +config APP_DUMPLEASES bool "Lease display utility (dumpleases)" default n - depends on CONFIG_APP_UDHCPD + depends on APP_UDHCPD help dumpleases displays the leases written out by the udhcpd server. Lease times are stored in the file by time remaining in lease, or @@ -23,7 +23,7 @@ config CONFIG_APP_DUMPLEASES See http://udhcp.busybox.net for further details. -config CONFIG_APP_UDHCPC +config APP_UDHCPC bool "udhcp Client (udhcpc)" default n help @@ -35,21 +35,21 @@ config CONFIG_APP_UDHCPC See http://udhcp.busybox.net for further details. -config CONFIG_FEATURE_UDHCP_SYSLOG +config FEATURE_UDHCP_SYSLOG bool "Log udhcp messages to syslog" default n - depends on CONFIG_APP_UDHCPD || CONFIG_APP_UDHCPC - select CONFIG_FEATURE_SYSLOG + depends on APP_UDHCPD || APP_UDHCPC + select FEATURE_SYSLOG help If not daemonized, udhcpd prints its messages to stdout/stderr. If this option is selected, it will also log them to syslog. See http://udhcp.busybox.net for further details. -config CONFIG_FEATURE_UDHCP_DEBUG +config FEATURE_UDHCP_DEBUG bool "Compile udhcp with noisy debugging messages" default n - depends on CONFIG_APP_UDHCPD || CONFIG_APP_UDHCPC + depends on APP_UDHCPD || APP_UDHCPC help If selected, udhcpd will output extra debugging output. If using this option, compile uDHCP with "-g", and do not fork the daemon to diff --git a/networking/udhcp/Kbuild b/networking/udhcp/Kbuild new file mode 100644 index 0000000..90047c1 --- /dev/null +++ b/networking/udhcp/Kbuild @@ -0,0 +1,17 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> +# +# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. +# + +lib-y:= +lib-$(CONFIG_APP_UDHCPC) += common.o options.o packet.o pidfile.o \ + signalpipe.o socket.o +lib-$(CONFIG_APP_UDHCPD) += common.o options.o packet.o pidfile.o \ + signalpipe.o socket.o +lib-$(CONFIG_APP_UDHCPC) += dhcpc.o clientpacket.o clientsocket.o \ + script.o +lib-$(CONFIG_APP_UDHCPD) += dhcpd.o arpping.o files.o leases.o \ + serverpacket.o static_leases.o +lib-$(CONFIG_APP_DUMPLEASES) += dumpleases.o diff --git a/networking/udhcp/Makefile b/networking/udhcp/Makefile deleted file mode 100644 index 23131f8..0000000 --- a/networking/udhcp/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - -#ifndef top_srcdir -#top_srcdir=../.. -#endif -#ifndef top_builddir -#top_builddir=../.. -#endif -srcdir=$(top_srcdir)/networking/udhcp -UDHCP_DIR:=./ -include $(top_srcdir)/Rules.mak -include $(top_builddir)/.config -include Makefile.in -all: $(libraries-y) --include $(top_builddir)/.depend - -clean: - rm -f *.o *.a $(AR_TARGET) - diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in deleted file mode 100644 index cbc6f2b..0000000 --- a/networking/udhcp/Makefile.in +++ /dev/null @@ -1,53 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -# - -UDHCP_AR:=udhcp.a -ifndef $(UDHCP_DIR) -UDHCP_DIR:=$(top_builddir)/networking/udhcp/ -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_APP_UDHCPC)),y) -CONFIG_UDHCP_SHARED=y -else -ifeq ($(strip $(CONFIG_APP_UDHCPD)),y) -CONFIG_UDHCP_SHARED=y -else -CONFIG_UDHCP_SHARED=n -endif -endif - -UDHCP-y:= -UDHCP-$(CONFIG_UDHCP_SHARED) += common.c options.c packet.c pidfile.c \ - signalpipe.c socket.c -UDHCP-$(CONFIG_APP_UDHCPC) += dhcpc.c clientpacket.c clientsocket.c \ - script.c -UDHCP-$(CONFIG_APP_UDHCPD) += dhcpd.c arpping.c files.c leases.c \ - serverpacket.c static_leases.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) -APPLET_SRC-y+=$(UDHCP-y) -APPLET_SRC-a+=$(UDHCP-a) - -UDHCP_INCLUDES:=$(srcdir) - -APPLETS_DEFINE-y+= -I$(UDHCP_INCLUDES) -APPLETS_DEFINE-a+= -I$(UDHCP_INCLUDES) - -$(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) - $(do_ar) - -$(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c - $(compile.c) |