X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibnids%2FMakefile;h=dde7df9bc02c63ac965faffb944ebe180f7c41c3;hb=d3a743ad417246fb7b2acddab3dbf48928b86dc1;hp=faf5c95ecddae15e12c0dee1a5fc4e854443f7b9;hpb=5360edce8f45be94248e74df88c9c3c4206bf3ce;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libnids/Makefile b/libs/libnids/Makefile
index faf5c95ecd..dde7df9bc0 100644
--- a/libs/libnids/Makefile
+++ b/libs/libnids/Makefile
@@ -12,13 +12,9 @@ PKG_NAME:=libnids
 PKG_VERSION:=1.18
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.packetfactory.net/projects/libnids/dist/
 PKG_MD5SUM:=9ee6dcdfac97bae6fe611aa27d2594a5
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,23 +23,27 @@ define Package/libnids
   CATEGORY:=Libraries
   DEPENDS:=+libnet0
   TITLE:=A network intrusion detection library
-  DESCRIPTION:=\
-	An implementation of an E-component of Network Intrusion Detection \\\
-	System.
   URL:=http://www.packetfactory.net/projects/libnids/
 endef
 
+define Package/libnids/description
+	An implementation of an E-component of Network Intrusion Detection 
+	System.
+endef
+
 define Build/Configure
 	$(call Build/Configure/Default, \
-			--enable-shared \
-			--enable-static \
-			--with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \
-			--with-libpcap="$(STAGING_DIR)/usr" \
-			, \
-			CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
+		--enable-shared \
+		--enable-static \
+		--with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.0.x" \
+		--with-libpcap="$(STAGING_DIR)/usr" \
+		, \
+		CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
 	)
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LNETLIB="-L$(STAGING_DIR)/usr/lib/libnet-1.0.x/lib -lnet" \
@@ -53,15 +53,10 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/nids.h \
-		$(STAGING_DIR)/usr/lib/libnids.{a,so*}
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libnids/install