Interface was hardcoded, (cut/paste from the testing openwrt machine)

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

diff --git a/openwrt/package/libpcap/Makefile b/openwrt/package/libpcap/Makefile
index 89f9753..42bac46 100644 (file)
--- a/openwrt/package/libpcap/Makefile
+++ b/openwrt/package/libpcap/Makefile
@@ -4,12 +4,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
 PKG_VERSION:=0.8.3
 
 PKG_NAME:=libpcap
 PKG_VERSION:=0.8.3

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b
 
 PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b
 

-PKG_SOURCE_URL:= \
-       http://www.tcpdump.org/release \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://www.tcpdump.org/release/

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


@@ -20,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,LIBPCAP,libpcap,$(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} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \


@@ -50,19 +48,20 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --enable-shared \
                  --enable-static \
                  --disable-yydebug \
                  --enable-shared \
                  --enable-static \
                  --disable-yydebug \

+                 --enable-ipv6 \

                  --with-build-cc=$(HOSTCC) \
                  --with-pcap=linux \
        );
                  --with-build-cc=$(HOSTCC) \
                  --with-pcap=linux \
        );

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

 
 

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

+               CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \

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

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

 
 $(IPKG_LIBPCAP):
        install -m0755 -d $(IDIR_LIBPCAP)/usr/lib
 
 $(IPKG_LIBPCAP):
        install -m0755 -d $(IDIR_LIBPCAP)/usr/lib


@@ -73,8 +72,9 @@ $(IPKG_LIBPCAP):
 $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/
 $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/

-       mkdir -p $(I_LIBPCAP_DEV)/usr/lib
+       mkdir -p $(STAGING_DIR)/usr/lib

        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/

+       touch $(STAGING_DIR)/usr/lib/libpcap.so

 
 install-dev: $(STAGING_DIR)/usr/lib/libpcap.so
 
 
 install-dev: $(STAGING_DIR)/usr/lib/libpcap.so
 


@@ -82,5 +82,5 @@ uninstall-dev:
        rm -rf $(STAGING_DIR)/usr/include/pcap*
        rm -rf $(STAGING_DIR)/usr/lib/libpcap.{a,so*}
 
        rm -rf $(STAGING_DIR)/usr/include/pcap*
        rm -rf $(STAGING_DIR)/usr/lib/libpcap.{a,so*}
 

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