summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-29 00:51:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-29 00:51:33 +0000
commitf2f110a1ea6748a1d0323f5d7e0014e398f62891 (patch)
tree2e0459136f65cd25d3406fb1287c6f30b3433323
parentf43b1dd8f1dbade4b8c6496a8c331c4b28b15c1a (diff)
iptables: export libipq
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16164 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/iptables/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 6d912a066..b7ffa5a21 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -252,9 +252,7 @@ CONFIGURE_ARGS += \
--with-kernel="$(LINUX_DIR)" \
--with-xtlibdir=/usr/lib/iptables
-define Build/Compile
- mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR) \
+IPTABLES_MAKEOPTS = \
$(TARGET_CONFIGURE_OPTS) \
COPT_FLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="-rdynamic -static-libgcc" \
@@ -262,6 +260,11 @@ define Build/Compile
KBUILD_OUTPUT="$(LINUX_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install $(MAKE_TARGETS)
+
+define Build/Compile
+ mkdir -p $(PKG_INSTALL_DIR)
+ $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS)
+ $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS)
endef
define Build/InstallDev
@@ -273,11 +276,13 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/include/net/netfilter/*.h $(1)/usr/include/net/netfilter/
$(CP) $(PKG_BUILD_DIR)/include/iptables/*.h $(1)/usr/include/iptables/
$(CP) $(PKG_BUILD_DIR)/include/iptables.h $(1)/usr/include/
+ $(CP) $(PKG_BUILD_DIR)/include/libipq/libipq.h $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.{a,so*} $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libiptc.pc $(1)/usr/lib/pkgconfig/