summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-03 16:50:04 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:37:50 +0200
commitbcadd2ded2d86bf982564c816a6192c423ccb7e0 (patch)
tree92c15f1bda98fdd8a261b7a52bcec846a8da6e38
parent709cc8800e7d8600e181cf6b9f8b1033faefe596 (diff)
remove convoluted recursive debug/release target magic
this has been a) dysfunct and b) unnecessary for *quite* a while. Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Change-Id: I5d658a15d0c1dc923002f8d773eecb8382cd213d
-rw-r--r--src/src.pro40
-rw-r--r--src/tools/tools.pro39
2 files changed, 0 insertions, 79 deletions
diff --git a/src/src.pro b/src/src.pro
index e46dc2e68a..dc3e850d8f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -74,44 +74,4 @@ sub_src_target.target = sub-src
sub_src_target.recurse_target =
QMAKE_EXTRA_TARGETS += sub_src_target
-# This gives us a top level debug/release
-for(subname, SRC_SUBDIRS) {
- subdir = $$subname
- !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir)
- subpro = $$subdir/$${basename(subdir)}.pro
- !exists($$subpro):next()
- subtarget = $$replace(subdir, [^A-Za-z0-9], _)
- reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\)
- subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
- subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
- subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
- include($$subpro, SUB)
- !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB.TEMPLATE, lib) | isEqual(SUB.TEMPLATE, subdirs)):!separate_debug_info {
- #debug
- debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
- debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
- EXTRA_DEBUG_TARGETS += debug-$${subtarget}
- QMAKE_EXTRA_TARGETS += debug-$${subtarget}
- #release
- release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
- release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
- EXTRA_RELEASE_TARGETS += release-$${subtarget}
- QMAKE_EXTRA_TARGETS += release-$${subtarget}
- } else { #do not have a real debug target/release
- #debug
- debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
- debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
- EXTRA_DEBUG_TARGETS += debug-$${subtarget}
- QMAKE_EXTRA_TARGETS += debug-$${subtarget}
- #release
- release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
- release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
- EXTRA_RELEASE_TARGETS += release-$${subtarget}
- QMAKE_EXTRA_TARGETS += release-$${subtarget}
- }
-}
-debug.depends = $$EXTRA_DEBUG_TARGETS
-release.depends = $$EXTRA_RELEASE_TARGETS
-QMAKE_EXTRA_TARGETS += debug release
-
SUBDIRS += $$SRC_SUBDIRS
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 8ad30a998d..875203b62c 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -33,44 +33,5 @@ contains(QT_CONFIG, dbus) {
}
}
-# Special handling, depending on type of project, if it used debug/release or only has one configuration
-EXTRA_DEBUG_TARGETS =
-EXTRA_RELEASE_TARGETS =
-for(subname, TOOLS_SUBDIRS) {
- subdir = $$subname
- !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir)
- subpro = $$subdir/$${basename(subdir)}.pro
- !exists($$subpro):next()
- subtarget = $$replace(subdir, [^A-Za-z0-9], _)
- reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\)
- subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
- subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
- subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
- include($$subpro, SUB)
- !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB.TEMPLATE, lib) | isEqual(SUB.TEMPLATE, subdirs)):!separate_debug_info {
- #debug
- debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
- debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
- EXTRA_DEBUG_TARGETS += debug-$${subtarget}
- QMAKE_EXTRA_TARGETS += debug-$${subtarget}
- #release
- release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
- release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
- EXTRA_RELEASE_TARGETS += release-$${subtarget}
- QMAKE_EXTRA_TARGETS += release-$${subtarget}
- } else { #do not have a real debug target/release
- #debug
- debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
- debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
- EXTRA_DEBUG_TARGETS += debug-$${subtarget}
- QMAKE_EXTRA_TARGETS += debug-$${subtarget}
- #release
- release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
- release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
- EXTRA_RELEASE_TARGETS += release-$${subtarget}
- QMAKE_EXTRA_TARGETS += release-$${subtarget}
- }
-}
-
SUBDIRS = $$TOOLS_SUBDIRS $$SUBDIRS
isEqual(TARGET,tools): SUBDIRS += $$SRC_SUBDIRS