move library packages to package/libs/

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 6b3617f..fb90df8 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -13,10 +13,9 @@ PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
 PKG_MD5SUM ?= unknown
 PKG_BUILD_PARALLEL ?=
-PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
 
 ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
-  MAKE_J:=$(MAKE_JOBSERVER)
+  MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
 else
   MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
 endif
@@ -52,6 +51,8 @@ ifneq ($(if $(CONFIG_SRC_TREE_OVERRIDE),$(wildcard ./git-src)),)
   QUILT:=1
 endif
 
+PKG_DIR_NAME:=$(lastword $(subst /,$(space),$(CURDIR)))
+
 include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/package-defaults.mk
@@ -248,6 +249,14 @@ Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,))
 Build/Dist=$(call Build/Dist/Default,)
 Build/DistCheck=$(call Build/DistCheck/Default,)
 
+.NOTPARALLEL:
+
+.PHONY: prepare-package-install
+prepare-package-install:
+       @mkdir -p $(PKG_INFO_DIR)
+       @touch $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.clean
+       @echo "$(filter-out essential,$(PKG_FLAGS))" > $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.flags
+
 $(PACKAGE_DIR):
        mkdir -p $@
        
@@ -255,8 +264,8 @@ dumpinfo:
 download:
 prepare:
 configure:
-compile:
-install:
+compile: prepare-package-install
+install: compile
 clean-staging: FORCE
        rm -f $(STAMP_INSTALLED)
        @-(\