X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Flibdnet%2FMakefile;h=436cde416eaee9b00f7656a6e29c20da89db22e7;hb=b0190e566b5d28ed7266beb87731e5079c455155;hp=420c110c426acc45b007f03b3dc6a349cdfee7b1;hpb=9cf5c345933245b169449a6202cd87e3ea7f4e91;p=packages.git

diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile
index 420c110c4..436cde416 100644
--- a/libs/libdnet/Makefile
+++ b/libs/libdnet/Makefile
@@ -15,10 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=416b765e9d9961501ac85e9a366fd219
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/libdnet-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,57 +22,68 @@ define Package/libdnet
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Low-level network library
-  DESCRIPTION:=\
-	libdnet is a library of simplified, portable interface to several \\\
-	low-level networking routines.
   URL:=http://sourceforge.net/projects/libdnet/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.in \
-		include.m4 \
-		aclocal.m4 \
-		Makefile.in \
-		configure \
-	);
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		, \
-		ac_cv_dnet_bsd_bpf=no \
-	)
+define Package/libdnet/description
+	libdnet is a library of simplified, portable interface to several 
+	low-level networking routines.
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+define Package/pydnet
+  SECTION:=libs
+  DEPENDS:=libdnet +python
+  CATEGORY:=Libraries
+  TITLE:=Low-level network library
+  URL:=http://sourceforge.net/projects/libdnet/
 endef
 
-define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/
+define Package/pydnet/description
+	libdnet is a library of simplified, portable interface to several 
+	low-level networking routines.
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/bin/dnet-config \
-		$(STAGING_DIR)/usr/include/dnet.h  \
-		$(STAGING_DIR)/usr/include/dnet  \
-		$(STAGING_DIR)/usr/lib/libdnet.{a,so*}
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--without-check \
+	--without-python
+		
+CONFIGURE_VARS += \
+	ac_cv_dnet_bsd_bpf=no
+
+MAKE_FLAGS += \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(1)/usr/bin/
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libdnet/install
-	install -d -m0755 $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(1)/usr/lib/
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/
+endef
+
+define Package/pydnet/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	cd $(PKG_BUILD_DIR)/python; \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	$(STAGING_DIR)/usr/bin/hostpython ./setup.py install \
+		--no-compile --prefix $(PKG_INSTALL_DIR)/usr
+	cp -a $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/
 endef
 
+
 $(eval $(call BuildPackage,libdnet))
+$(eval $(call BuildPackage,pydnet))