Changeset d419478 in freewrt for package/libupnp

Timestamp:

Jul 21, 2006, 1:56:32 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

50d34d3

Parents:

2029b2e

Message:

• whitespace cleanup, while here
• move WRKDIR and DISTFILES definition into PKG_template
• define WRKDIR via parent BUILD_DIR instead of going up from WRKSRC
• use a sub-directory as WRKDIR, like BSD
• rename PKG_BUILD_DIR into WRKBUILD
• define WRKBUILD relative via WRKDIR
• rename PKG_INSTALL_DIR into WRKINST
• fix a few dependencies
• make use of common cases in the definition of WRKBUILD and WRKINST, removing many redundant lines
• use WRKDIR instead of BUILD_DIR in places where the latter was used previously
• while here, remove PKG_CAT stuff

this only affects packages, for now

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@303 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/libupnp/Makefile (modified) (3 diffs)

package/libupnp/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=@SF/upnp
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -19 +16 @@
 $(eval $(call PKG_template,LIBUPNP,libupnp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-        $(MAKE) -C $(PKG_BUILD_DIR)/upnp \
+$(WRKBUILD)/.built: $(WRKBUILD)/.configured
+        $(MAKE) -C $(WRKBUILD)/upnp \
                 $(TARGET_CONFIGURE_OPTS) \
                 OPT_FLAGS="$(TARGET_CFLAGS)" \
@@ -31 +28 @@
 $(IPKG_LIBUPNP):
         install -m0755 -d $(IDIR_LIBUPNP)/usr/lib
-        $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \
-        $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \
-        $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \
+        $(CP) $(WRKBUILD)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \
+        $(CP) $(WRKBUILD)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \
+        $(CP) $(WRKBUILD)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \
         $(RSTRIP) $(IDIR_LIBUPNP)
         $(IPKG_BUILD) $(IDIR_LIBUPNP) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libupnp.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libupnp.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/include/upnp
-        $(CP) $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/
+        $(CP) $(WRKBUILD)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \
-        $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \
-        $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \
+        $(CP) $(WRKBUILD)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \
+        $(CP) $(WRKBUILD)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \
+        $(CP) $(WRKBUILD)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \
         touch $@