large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

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

diff --git a/openwrt/package/libnet/Makefile b/openwrt/package/libnet/Makefile
index f628f1b..4e89b35 100644 (file)
--- a/openwrt/package/libnet/Makefile
+++ b/openwrt/package/libnet/Makefile
@@ -7,9 +7,7 @@ PKG_VERSION:=1.0.2a
 PKG_RELEASE:=7
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
 
 PKG_RELEASE:=7
 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667
 

-PKG_SOURCE_URL:=\
-       http://www.packetfactory.net/libnet/dist/deprecated/ \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 


@@ -18,9 +16,14 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 

+ENDIAN:=lil
+ifeq ($(ARCH),mips)
+ENDIAN:=big
+endif
+

 $(eval $(call PKG_template,LIBNET,libnet,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call PKG_template,LIBNET,libnet,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                touch configure.in; \
                touch include.m4; \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                touch configure.in; \
                touch include.m4; \


@@ -33,7 +36,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                ac_libnet_have_pf_packet=yes \
                ac_cv_lbl_unaligned_fail=no \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                ac_libnet_have_pf_packet=yes \
                ac_cv_lbl_unaligned_fail=no \

-               ac_cv_libnet_endianess=lil \
+               ac_cv_libnet_endianess=$(ENDIAN) \

                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \


@@ -58,39 +61,40 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --enable-static \
                --with-pf_packet=yes \
        );
                --enable-static \
                --with-pf_packet=yes \
        );

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)"
+$(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) \

+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@

 
 

-$(IPKG_LIBNET): $(STAGING_DIR)/usr/lib/libnet.so
+$(IPKG_LIBNET):

        install -m0755 -d $(IDIR_LIBNET)/usr/lib
        install -m0755 -d $(IDIR_LIBNET)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/

        $(RSTRIP) $(IDIR_LIBNET)
        $(IPKG_BUILD) $(IDIR_LIBNET) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
        $(RSTRIP) $(IDIR_LIBNET)
        $(IPKG_BUILD) $(IDIR_LIBNET) $(PACKAGE_DIR)
 
 $(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/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/bin/

        mkdir -p $(STAGING_DIR)/usr/include
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        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
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/
+       touch $@

 
 install-dev: $(STAGING_DIR)/usr/lib/libnet.so
 
 uninstall-dev:
 
 install-dev: $(STAGING_DIR)/usr/lib/libnet.so
 
 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*}
+       rm -rf \
+               $(STAGING_DIR)/usr/bin/libnet-config \
+               $(STAGING_DIR)/usr/include/libnet*  \
+               $(STAGING_DIR)/usr/lib/libnet.{a,so*} \

 
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev