Simplify configure and add target optimizations,

Rename dhcp package to dhcp-server,
Add dhcp-relay package.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1405 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index d1b0530..e52c460 100644 (file)
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -1,7 +1,25 @@
 config BR2_PACKAGE_DHCP
-       tristate "dhcp"
+       bool
+       default n
+       depends BR2_PACKAGE_DHCP_RELAY || BR2_PACKAGE_DHCP_SERVER
+
+config BR2_PACKAGE_DHCP_RELAY
+       tristate "dhcp-relay - ISC DHCP relay"
+       default m if CONFIG_DEVEL
+       help
+         ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration 
+         Protocol) relay daemon.
+         
+         http://www.isc.org/
+         
+
+config BR2_PACKAGE_DHCP_SERVER
+       tristate "dhcp-server - ISC DHCP server"
        default m if CONFIG_DEVEL
        help
-       dhcp server
+         ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration 
+         Protocol) server daemon.
+         
+         http://www.isc.org/
+         
 
-       http://www.isc.org

diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index 70a72c5..947948e 100644 (file)
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -16,15 +16,14 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,DHCP,dhcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+       (cd $(PKG_BUILD_DIR) ; \
                ./configure \
+                 --copts "$(TARGET_CFLAGS)" \
+                 linux-2.2 \
        );
        touch $@
 
@@ -37,8 +36,14 @@ $(PKG_BUILD_DIR)/.built:
                all install
        touch $@
 
-$(IPKG_DHCP):
-       install -d -m0755 $(IDIR_DHCP)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP)/usr/sbin
-       $(RSTRIP) $(IDIR_DHCP)
-       $(IPKG_BUILD) $(IDIR_DHCP) $(PACKAGE_DIR)
+$(IPKG_DHCP_RELAY):
+       install -d -m0755 $(IDIR_DHCP_RELAY)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(IDIR_DHCP_RELAY)/usr/sbin/
+       $(RSTRIP) $(IDIR_DHCP_RELAY)
+       $(IPKG_BUILD) $(IDIR_DHCP_RELAY) $(PACKAGE_DIR)
+
+$(IPKG_DHCP_SERVER):
+       install -d -m0755 $(IDIR_DHCP_SERVER)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP_SERVER)/usr/sbin/
+       $(RSTRIP) $(IDIR_DHCP_SERVER)
+       $(IPKG_BUILD) $(IDIR_DHCP_SERVER) $(PACKAGE_DIR)

diff --git a/package/dhcp/ipkg/dhcp-relay.control b/package/dhcp/ipkg/dhcp-relay.control
new file mode 100644 (file)
index 0000000..bc4f633
--- /dev/null
+++ b/package/dhcp/ipkg/dhcp-relay.control
@@ -0,0 +1,6 @@
+Package: dhcp-relay
+Priority: optional
+Section: net
+Maintainer: OpenWrt Developers <bugs@openwrt.org>
+Source:  http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/dhcp/
+Description: ISC DHCP relay

diff --git a/package/dhcp/ipkg/dhcp-server.control b/package/dhcp/ipkg/dhcp-server.control
new file mode 100644 (file)
index 0000000..59b6ed4
--- /dev/null
+++ b/package/dhcp/ipkg/dhcp-server.control
@@ -0,0 +1,6 @@
+Package: dhcp-server
+Priority: optional
+Section: net
+Maintainer: OpenWrt Developers <bugs@openwrt.org>
+Source:  http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/dhcp/
+Description: ISC DHCP server

diff --git a/package/dhcp/ipkg/dhcp.control b/package/dhcp/ipkg/dhcp.control
deleted file mode 100644 (file)
index d6c110a..0000000
--- a/package/dhcp/ipkg/dhcp.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: dhcp
-Priority: optional
-Section: net
-Maintainer: OpenWrt Developers <bugs@openwrt.org>
-Source:  http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/dhcp/
-Description: isc dhcp server