summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-17 10:28:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-07-17 14:11:05 +0100
commitd1561a0813e15c6694b136db116004b212a463f6 (patch)
treea3c770cdaf93528e7f7d0a45337a6efcc96145d0
parent2aecedd79e1cd579e6e494138eb79f76c3a6c6cc (diff)
for external modules add a dependency on the makefile.mk itself
so that on version bumps and/or added/removed patches that we rebuild them from scratch, which hopefully will make incremental builds post external module bump pain-free Change-Id: If268401a2794989d49861c08f7a69ef926cf5809
-rw-r--r--hyphen/makefile.mk7
-rw-r--r--icu/makefile.mk7
-rw-r--r--libcmis/makefile.mk7
-rw-r--r--solenv/inc/tg_ext.mk2
4 files changed, 1 insertions, 22 deletions
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index cdc70d5c480f..34dd6b59b0fe 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -110,10 +110,3 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-
-# Since you never know what will be in a patch (for example, it may already
-# patch at configure level) or in the case of a binary patch, we remove the
-# entire package directory if a patch is newer.
-# Changes in this makefile could also make a complete build necessary if
-# configure is affected.
-$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : makefile.mk
diff --git a/icu/makefile.mk b/icu/makefile.mk
index c529c99b11e8..d1051accca3b 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -322,10 +322,3 @@ $(LB)$/icule$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
$(LB)$/icutu$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
$(TOUCH) $@
.ENDIF
-
-# Since you never know what will be in a patch (for example, it may already
-# patch at configure level) or in the case of a binary patch, we remove the
-# entire package directory if a patch is newer.
-# Changes in this makefile could also make a complete build necessary if
-# configure is affected.
-$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : makefile.mk
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index 03c0b59950a4..f622014f1e64 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -67,10 +67,3 @@ BUILD_DIR=src$/libcmis
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-
-# Since you never know what will be in a patch (for example, it may already
-# patch at configure level) or in the case of a binary patch, we remove the
-# entire package directory if a patch is newer.
-# Changes in this makefile could also make a complete build necessary if
-# configure is affected.
-$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : makefile.mk
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 453a17b58e0e..ee09295df42f 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -174,7 +174,7 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
@$(RENAME) $@.$(INPATH) $@
#do unpack
-$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
+$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP) makefile.mk
$(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR).exists $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
$(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
@-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)