summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-25 08:49:35 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-25 09:03:36 (GMT)
commit1cf0b9e36eaab3bf593509260e8a2de0c85548bb (patch)
tree2a2a60698430fd039cb6957c0f5f1c801ce73666 /mkspecs
parent677f1b4af363845189d93bf564ab9ba97eb160e0 (diff)
downloadQt-1cf0b9e36eaab3bf593509260e8a2de0c85548bb.zip
Qt-1cf0b9e36eaab3bf593509260e8a2de0c85548bb.tar.gz
Qt-1cf0b9e36eaab3bf593509260e8a2de0c85548bb.tar.bz2
Misc fixes to FLM files
1) FLMs should not have more than one phase dependency -> removed extra dependencies, leaving only what is actually necessary. 2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete 3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm so that unrelated components can continue building instead of halting the whole build at EXPORT phase. 4) Added .export to qmake_extra_pre_targetdep interface so that it is actually executed in EXPORT phase where it should be. Task-number: QTBUG-8513 Reviewed-by: Janne Koskinen
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm2
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm8
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm2
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm3
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qt.xml2
5 files changed, 4 insertions, 13 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
index 3defe30..3877edb 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
@@ -7,14 +7,12 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
CLEAN_TARGET:=
define qmake_emulator_deployment
$(ALLTARGET):: $(1)
-FINAL::$(1)
# Prevent duplicate targets from being created
$(SINGLETON):=1
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
index 79ab8cb..daf33d4 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
@@ -7,21 +7,17 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET))
define qmake_extra_pre_targetdep
-$(ALLTARGET):: $(PREDEP_TARGET)
EXPORT:: $(PREDEP_TARGET)
-LIBRARY:: $(PREDEP_TARGET)
-TARGET:: $(PREDEP_TARGET)
# Prevent duplicate targets from being created
$(SINGLETON):=1
-$(PREDEP_TARGET): $(DEPS)
- $(call startrule,qmake_extra_pre_targetdep) \
+$(PREDEP_TARGET): $(DEPS)
+ $(call startrule,qmake_extra_pre_targetdep,FORCESUCCESS) \
$(COMMAND) \
$(call endrule,qmake_extra_pre_targetdep)
endef
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
index 8ad89e7..9612d2e 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
@@ -7,7 +7,6 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
POST_LINK_TARGET:=POST_LINK_$(PLATFORM_PATH)_$(CFG_PATH)_$(call sanitise,$(LINK_TARGET))
POST_LINK_DEP:=$(EPOCROOT)/epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/$(LINK_TARGET)
@@ -21,7 +20,6 @@ endef
define qmake_post_link
$(ALLTARGET):: $(POST_LINK_TARGET)
-FINAL:: $(POST_LINK_TARGET)
$(POST_LINK_TARGET): $(POST_LINK_DEP)
$(call startrule,qmake_post_link) \
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
index d952f8f..e0b6503 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -7,7 +7,6 @@
# **
# ****************************************************************************/
-include $(FLMHOME)/metaflm.mk
SINGLETON:=$(call sanitise,TSTORE_SINGLETON_$(EXTENSION_ROOT))
@@ -27,7 +26,7 @@ VISUAL_CFG:=RELEASE
endif
define qmake_store_build
-FINAL:: $(STORE_BUILD_TARGET)
+$(ALLTARGET):: $(STORE_BUILD_TARGET)
$(STORE_BUILD_TARGET):
$(call startrule,qmake_store_build) \
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
index 904f113..0f7db3c 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml
+++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
@@ -16,7 +16,7 @@
<!-- Extension interfaces : replacements for Template Extension Makefiles -->
- <interface name="qt.qmake_extra_pre_targetdep" extends="Symbian.UserFLM"
+ <interface name="qt.qmake_extra_pre_targetdep.export" extends="Symbian.UserFLM"
flm="qmake_extra_pre_targetdep.flm">
<param name='PREDEP_TARGET' />
<param name='DEPS' default = '' />