summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-11 16:54:14 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-11 16:54:14 +0000
commitae2049b917ae4b5c5461010e18b5a505dae8f400 (patch)
tree281ebad5a249f696daffa4984b89aa5929602a82
parent44ba04efe200178dd52943b2c1edd8418fbac0ba (diff)
remove extra targets
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3760 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/rules.mk27
1 files changed, 8 insertions, 19 deletions
diff --git a/package/rules.mk b/package/rules.mk
index 20fa5d4c8..22f7e261e 100644
--- a/package/rules.mk
+++ b/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 += \