diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-05-11 23:14:04 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-05-11 23:14:04 +0000 |
| commit | fc6fc186955719618a956d6a73ee3d3bf7b3406a (patch) | |
| tree | b551ec1dfb4250b1e013f4e7d68589a430b4a204 | |
| parent | a8fa4331314a313deb0a36ce172412c086bc4123 (diff) | |
revert .prepared handling
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3765 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/rules.mk | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/package/rules.mk b/package/rules.mk index 3f22cf642..e5df61e17 100644 --- a/package/rules.mk +++ b/package/rules.mk @@ -5,14 +5,18 @@ else endif define Build/DefaultTargets - prepared: FORCE $(DL_DIR)/$(PKG_SOURCE) - ifeq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),.) + + ifeq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),.) + $(PKG_BUILD_DIR)/.prepared: package-clean + endif + + $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) @-rm -rf $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR) $(call Build/Prepare) - endif + touch $$@ - $(PKG_BUILD_DIR)/.configured: prepared + $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(call Build/Configure) touch $$@ @@ -109,7 +113,7 @@ define BuildPackage DUMPINFO += \ echo "@@"; - $$(IDIR_$(1))/CONTROL/control: prepared + $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared mkdir -p $$(IDIR_$(1))/CONTROL echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control @@ -221,17 +225,17 @@ else $(PACKAGE_DIR): mkdir -p $@ - source: FORCE $(DL_DIR)/$(PKG_SOURCE) - prepare: FORCE prepared - configure: FORCE $(PKG_BUILD_DIR)/.configured + source: $(DL_DIR)/$(PKG_SOURCE) + prepare: $(PKG_BUILD_DIR)/.prepared + configure: $(PKG_BUILD_DIR)/.configured - compile-targets: FORCE - compile: FORCE compile-targets + compile-targets: + compile: compile-targets - install-targets: FORCE - install: FORCE install-targets + install-targets: + install: install-targets - clean-targets: FORCE + clean-targets: clean: FORCE @$(MAKE) clean-targets rm -rf $(PKG_BUILD_DIR) |