summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-14 09:30:29 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-14 09:30:29 +0000
commit0ee3b9c766a44d47498314345af9a9eb38730a34 (patch)
treebee5b1463c6512e8ff1a5cb473fccd38799e56a9 /package
parent53df1c611254749b669d19d2ffa7fefe2f33019b (diff)
revert .built rule; fix typos
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3775 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/rules.mk26
1 files changed, 14 insertions, 12 deletions
diff --git a/package/rules.mk b/package/rules.mk
index e5df61e17..d25b487a7 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -10,6 +10,10 @@ define Build/DefaultTargets
$(PKG_BUILD_DIR)/.prepared: package-clean
endif
+ ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
+ $(PKG_BUILD_DIR)/.built: package-rebuild
+ endif
+
$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
@-rm -rf $(PKG_BUILD_DIR)
@mkdir -p $(PKG_BUILD_DIR)
@@ -20,14 +24,16 @@ define Build/DefaultTargets
$(call Build/Configure)
touch $$@
- built: FORCE $(PKG_BUILD_DIR)/.configured
- ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
+ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(call Build/Compile)
- endif
-
+ touch $$@
+
package-clean: FORCE
$(call Build/Clean)
+ package-rebuild: FORCE
+ @-rm $(PKG_BUILD_DIR)/.built
+
define Build/DefaultTargets
endef
endef
@@ -70,16 +76,12 @@ define BuildPackage
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
- ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
- COMPILE_$(1):=1
- endif
-
ifeq ($(CONFIG_PACKAGE_$(1)),y)
install-targets: $$(INFO_$(1))
endif
- ifneq ($(COMPILE_$(1)),)
- compile-targets: $(IPKG_$(1))
+ ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+ compile-targets: $$(IPKG_$(1))
endif
IDEPEND_$(1):=$$(strip $$(DEPENDS))
@@ -129,7 +131,7 @@ define BuildPackage
[ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
done
- $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control built
+ $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
$(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR)
$(RSTRIP) $$(IDIR_$(1))
@@ -144,7 +146,7 @@ define BuildPackage
clean: $(1)-clean
ifneq ($(__DEFAULT_TARGETS),1)
- $$(eval $$(call Build/DefaultTargets,$(1)))
+ $(eval $(call Build/DefaultTargets,$(1)))
endif
endef