Fix dhcp-forwarder build, move init-script to ./files/

[openwrt.git] / openwrt / package / libnet / Makefile

diff --git a/openwrt/package/libnet/Makefile b/openwrt/package/libnet/Makefile
index 79b8960..f628f1b 100644 (file)
--- a/openwrt/package/libnet/Makefile
+++ b/openwrt/package/libnet/Makefile
@@ -14,21 +14,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Libnet-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-IPKG_LIBNET:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_LIBNET:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_LIBNET:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
-
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.prepared
+$(eval $(call PKG_template,LIBNET,libnet,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                touch configure.in; \
                touch include.m4; \
                touch aclocal.m4; \
@@ -71,32 +64,33 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)"
-       touch $(PKG_BUILD_DIR)/.built
-
-$(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(STAGING_DIR)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
                install
-       rm -rf $(STAGING_DIR)/usr/lib/libnet.la
+       touch $(PKG_BUILD_DIR)/.built
 
 $(IPKG_LIBNET): $(STAGING_DIR)/usr/lib/libnet.so
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNET) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(IDIR_LIBNET)/usr/lib
-       cp -fpR $(STAGING_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/
-       $(STRIP) $(IDIR_LIBNET)/usr/lib/lib*.so*
-       mkdir -p $(PACKAGE_DIR)
+       install -m0755 -d $(IDIR_LIBNET)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/
+       $(RSTRIP) $(IDIR_LIBNET)
        $(IPKG_BUILD) $(IDIR_LIBNET) $(PACKAGE_DIR)
 
-$(INFO_LIBNET): $(IPKG_LIBNET)
-       $(IPKG) install $(IPKG_LIBNET)
+$(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(STAGING_DIR)/usr/bin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/bin/
+       mkdir -p $(STAGING_DIR)/usr/include
+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/
+       touch $(STAGING_DIR)/usr/lib/libnet.so
+
+install-dev: $(STAGING_DIR)/usr/lib/libnet.so
 
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_LIBNET)
-install: $(INFO_LIBNET)
+uninstall-dev:
+       rm -rf $(STAGING_DIR)/usr/bin/libnet-config
+       rm -rf $(STAGING_DIR)/usr/include/libnet*
+       rm -rf $(STAGING_DIR)/usr/lib/libnet.{a,so*}
 
-clean:
-       -$(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(STAGING_DIR)" \
-               uninstall
-       rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBNET)
+compile: install-dev
+clean: uninstall-dev