X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/900c05f6e102b84281efcd2fc5297b72d9253ba7..dceed6d8670394ecb3c3b9dd7dd805eed00d9586:/include/package.mk diff --git a/include/package.mk b/include/package.mk index bf82c6045..90750fe26 100644 --- a/include/package.mk +++ b/include/package.mk @@ -19,12 +19,14 @@ include $(INCLUDE_DIR)/depends.mk STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured STAMP_BUILT:=$(PKG_BUILD_DIR)/.built +STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed include $(INCLUDE_DIR)/download.mk include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/package-defaults.mk include $(INCLUDE_DIR)/package-dumpinfo.mk include $(INCLUDE_DIR)/package-ipkg.mk +include $(INCLUDE_DIR)/package-bin.mk override MAKEFLAGS= export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) @@ -42,12 +44,14 @@ endif define Download/default FILE:=$(PKG_SOURCE) URL:=$(PKG_SOURCE_URL) + SUBDIR:=$(PKG_SOURCE_SUBDIR) PROTO:=$(PKG_SOURCE_PROTO) VERSION:=$(PKG_SOURCE_VERSION) MD5SUM:=$(PKG_MD5SUM) endef define Build/DefaultTargets + $(if $(QUILT),$(Build/Quilt)) $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)) $(call Build/Autoclean) @@ -63,29 +67,36 @@ define Build/DefaultTargets $(STAMP_BUILT): $(STAMP_CONFIGURED) $(Build/Compile) + touch $$@ + + $(STAMP_INSTALLED): $(STAMP_BUILT) $(call Build/InstallDev,$(STAGING_DIR)) touch $$@ ifdef Build/InstallDev - compile: $(STAMP_BUILT) + compile: $(STAMP_INSTALLED) endif define Build/DefaultTargets endef + + prepare: $(STAMP_PREPARED) + configure: $(STAMP_CONFIGURED) endef define BuildPackage $(eval $(Package/Default)) $(eval $(Package/$(1))) -# Support obsolete DESCRIPTION field +ifdef DESCRIPTION +$$(error DESCRIPTION:= is obselete, use Package/PKG_NAME/description) +endif + ifndef Package/$(1)/description define Package/$(1)/description -$(TITLE)$(subst \, -,\ $(DESCRIPTION)) + $(TITLE) endef endif -# $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, ifeq ($($(FIELD)),) @@ -119,6 +130,14 @@ define libtool_fixup_libdir $(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g" endef +define pkg_install_files + $(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;) +endef + +define pkg_install_bin + $(foreach install_apps,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_apps)`; $(INSTALL_BIN) $(2)/$(install_apps) $(3)/`dirname $(install_apps)`;) +endef + define Build/Prepare $(call Build/Prepare/Default,) endef @@ -136,8 +155,8 @@ $(PACKAGE_DIR): dumpinfo: download: -prepare: $(STAMP_PREPARED) -configure: $(STAMP_CONFIGURED) +prepare: +configure: compile: install: clean: FORCE