From: Mike Baker Date: Thu, 11 May 2006 16:54:14 +0000 (+0000) Subject: remove extra targets X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d5e5f06d86beee8327e9fcaa7c8b0124d1af5599;p=openwrt%2Fstaging%2Fwigyori.git remove extra targets SVN-Revision: 3760 --- diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk index 20fa5d4c82..22f7e261e5 100644 --- a/openwrt/package/rules.mk +++ b/openwrt/package/rules.mk @@ -17,21 +17,18 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(call Build/Configure) touch $$@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: FORCE $(PKG_BUILD_DIR)/.configured +ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$(PKG_BUILD_DIR)) $(call Build/Compile) touch $$@ +endif -package-clean: +package-clean: FORCE $(call Build/Clean) rm -f $(PKG_BUILD_DIR)/.built -package-recompile: - rm -f $(PKG_BUILD_DIR)/.built - -.PHONY: package-clean package-recompile - -# define Build/DefaultTargets -# endef +define Build/DefaultTargets +endef endef define Package/Default @@ -75,25 +72,17 @@ IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list -ifneq ($(CONFIG_PACKAGE_$(1)),) -COMPILE_$(1):=1 -endif -ifneq ($(DEVELOPER),) +ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) COMPILE_$(1):=1 endif + ifeq ($(CONFIG_PACKAGE_$(1)),y) install-targets: $$(INFO_$(1)) endif -ifneq ($$(COMPILE_$(1)),) -ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$(PKG_BUILD_DIR)) -$(PKG_BUILD_DIR)/.built: package-recompile -endif - compile-targets: $$(IPKG_$(1)) endif - IDEPEND_$(1):=$$(strip $$(DEPENDS)) DUMPINFO += \