Simplify configure and add target optimizations,

[openwrt.git] / openwrt / package / dhcp-forwarder / Makefile

diff --git a/openwrt/package/dhcp-forwarder/Makefile b/openwrt/package/dhcp-forwarder/Makefile
index 92f2fe2..f92107c 100644 (file)
--- a/openwrt/package/dhcp-forwarder/Makefile
+++ b/openwrt/package/dhcp-forwarder/Makefile
@@ -2,29 +2,24 @@
 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

-PKG_NAME := dhcp-forwarder
-PKG_VERSION := 0.7
-PKG_RELEASE := 4
-PKG_MD5SUM := e7f876e615ebc3f96418f6477b4451e2
+PKG_NAME:=dhcp-forwarder
+PKG_VERSION:=0.7
+PKG_RELEASE:=4
+PKG_MD5SUM:=e7f876e615ebc3f96418f6477b4451e2

 
 

-PKG_SOURCE_URL := http://savannah.nongnu.org/download/dhcp-fwd/ \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
-PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT := bzcat
-PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg
+PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 

-$(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+include $(TOPDIR)/package/rules.mk

 
 

-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(PKG_BUILD_DIR)/.unpacked
+$(eval $(call PKG_template,DHCP_FORWARDER,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured: 
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ac_cv_func_malloc_0_nonnull="yes" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ac_cv_func_malloc_0_nonnull="yes" \


@@ -49,43 +44,23 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        )
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
        )

-       touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-         cfg_filename="/etc/dhcp-fwd.conf"
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@

 
 

-$(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd: $(PKG_BUILD_DIR)/.built
+$(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)

        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \

-         DESTDIR="$(PKG_INSTALL_DIR)" \
-        install
+               cfg_filename="/etc/dhcp-fwd.conf" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
+       touch $@

        
        

-$(PKG_IPK): $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       cp -fp $(PKG_NAME).conffiles $(PKG_IPK_DIR)/CONTROL/conffiles
-       chmod 0644 $(PKG_IPK_DIR)/CONTROL/conffiles
-       mkdir -p $(PKG_IPK_DIR)/etc
-       cp -fp $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(PKG_IPK_DIR)/etc/
-       chmod 0644 $(PKG_IPK_DIR)/etc/dhcp-fwd.conf
-       mkdir -p $(PKG_IPK_DIR)/etc/init.d
-       cp -fp $(PKG_NAME).init $(PKG_IPK_DIR)/etc/init.d/dhcp-fwd
-       chmod 0755 $(PKG_IPK_DIR)/etc/init.d/dhcp-fwd
-       mkdir -p $(PKG_IPK_DIR)/usr/bin
-       cp -fp $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(PKG_IPK_DIR)/usr/bin/
-       $(STRIP) $(PKG_IPK_DIR)/usr/bin/*
-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPK)
-
+$(IPKG_DHCP_FORWARDER):
+       install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc
+       install -m0644 $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(IDIR_DHCP_FORWARDER)/etc/
+       install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d
+       install -m0755 ./files/dhcp-fwd.init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd
+       install -m0755 -d $(IDIR_DHCP_FORWARDER)/usr/bin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/
+       $(RSTRIP) $(IDIR_DHCP_FORWARDER)
+       $(IPKG_BUILD) $(IDIR_DHCP_FORWARDER) $(PACKAGE_DIR)