Hi,

this patch fixes libupnp parallel build and cleans the Makefile a
little.

-Raphael
diff -pruN libupnp.orig//Makefile libupnp/Makefile
--- libupnp.orig//Makefile	2010-02-15 17:57:21.000000000 +0100
+++ libupnp/Makefile	2010-02-15 17:54:59.000000000 +0100
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libupnp
 PKG_VERSION:=1.6.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=...@sf/pupnp
 PKG_MD5SUM:=8918dcf7428cd119d0c8275765ff2833
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libupnp/Default
@@ -31,11 +33,10 @@ define Package/libupnp
 endef
 
 define Package/libupnp/description
-        The portable SDK for UPnP Devices (libupnp) provides developers with an
-	API and open source code for building control points, devices, and
-	bridges that are compliant with Version 1.0 of the  Universal Plug and
-	Play Device Architecture Specification and support several operating
-	systems like Linux, *BSD, Solaris and others.
+The portable SDK for UPnP Devices (libupnp) provides developers with an API and
+open source code for building control points, devices, and bridges that are
+compliant with Version 1.0 of the  Universal Plug and Play Device Architecture
+Specification.
 endef
 
 define Package/libupnp-sample
@@ -45,8 +46,7 @@ define Package/libupnp-sample
 endef
 
 define Package/libupnp-sample/description
-	TVcontrolpoint & tvdevice sample applications
-	run inside /etc/upnp-tvdevice/
+TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/
 endef
 
 define Build/Configure
@@ -57,20 +57,14 @@ define Build/Configure
 endef
 
 TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CCOPT="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-	$(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample/ upnp_tv_device upnp_tv_ctrlpt
-endef
+MAKE_ARGS += CCOPT="$(TARGET_CFLAGS)"
 
 define Build/Compile/libupnp-sample
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CCOPT="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		check
+	$(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample \
+		upnp_tv_device upnp_tv_ctrlpt
 endef
 
 define Build/InstallDev
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to