Changeset 1761 for trunk/kBuild/units/qt4.kmk

Timestamp:

Sep 6, 2008, 9:15:43 AM (17 years ago)

Author:

bird

Message:

qt3/4: _bld_* -> bld_*. Fixed some windows issues in qt3.

File:

• trunk/kBuild/units/qt4.kmk (modified) (5 diffs)

trunk/kBuild/units/qt4.kmk

@@ -799 +799 @@
 # Deal with QT_MODULES and QT_PREFIX.
 local qt_modules := \
-        $($(target)_QT_MODULES.$(_bld_trg)) \
-        $($(target)_QT_MODULES.$(_bld_trg_arch)) \
-        $($(target)_QT_MODULES.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_MODULES.$(_bld_trg_cpu)) \
-        $($(target)_QT_MODULES.$(_bld_type)) \
+        $($(target)_QT_MODULES.$(bld_trg)) \
+        $($(target)_QT_MODULES.$(bld_trg_arch)) \
+        $($(target)_QT_MODULES.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_MODULES.$(bld_trg_cpu)) \
+        $($(target)_QT_MODULES.$(bld_type)) \
         $($(target)_QT_MODULES)
 local qt_prefix := $(firstword \
-        $($(target)_QT_PREFIX.$(_bld_trg)) \
-        $($(target)_QT_PREFIX.$(_bld_trg_arch)) \
-        $($(target)_QT_PREFIX.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_PREFIX.$(_bld_trg_cpu)) \
-        $($(target)_QT_PREFIX.$(_bld_type)) \
+        $($(target)_QT_PREFIX.$(bld_trg)) \
+        $($(target)_QT_PREFIX.$(bld_trg_arch)) \
+        $($(target)_QT_PREFIX.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_PREFIX.$(bld_trg_cpu)) \
+        $($(target)_QT_PREFIX.$(bld_type)) \
         $($(target)_QT_PREFIX))
 ifeq ($(bld_trg),darwin)
@@ -835 +835 @@
 ifndef $(target)_QT_MOCSRCS
  $(foreach source, $(filter %.cxx %.CXX %.cpp %.CPP %.cc %.CC,\
-        $($(target)_SOURCES.$(_bld_trg)) \
-        $($(target)_SOURCES.$(_bld_trg_arch)) \
-        $($(target)_SOURCES.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_SOURCES.$(_bld_trg_cpu)) \
-        $($(target)_SOURCES.$(_bld_type)) \
+        $($(target)_SOURCES.$(bld_trg)) \
+        $($(target)_SOURCES.$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_SOURCES.$(bld_trg_cpu)) \
+        $($(target)_SOURCES.$(bld_type)) \
         $($(target)_SOURCES) \
         ), $(evalval def_unit_qt4_target_pre_cpp_source))
@@ -861 +861 @@
 # Deal with QT_MOCSRCS.
 $(foreach source, \
-        $($(target)_QT_MOCSRCS.$(_bld_trg)) \
-        $($(target)_QT_MOCSRCS.$(_bld_trg_arch)) \
-        $($(target)_QT_MOCSRCS.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_MOCSRCS.$(_bld_trg_cpu)) \
-        $($(target)_QT_MOCSRCS.$(_bld_type)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg_arch)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_MOCSRCS.$(bld_trg_cpu)) \
+        $($(target)_QT_MOCSRCS.$(bld_type)) \
         $($(target)_QT_MOCSRCS) \
         , $(evalvalctx def_unit_qt4_target_pre_handle_moc_src))
@@ -871 +871 @@
 # Deal with QT_MOCHDRS.
 $(foreach source, \
-        $($(target)_QT_MOCHDRS.$(_bld_trg)) \
-        $($(target)_QT_MOCHDRS.$(_bld_trg_arch)) \
-        $($(target)_QT_MOCHDRS.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_MOCHDRS.$(_bld_trg_cpu)) \
-        $($(target)_QT_MOCHDRS.$(_bld_type)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg_arch)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_MOCHDRS.$(bld_trg_cpu)) \
+        $($(target)_QT_MOCHDRS.$(bld_type)) \
         $($(target)_QT_MOCHDRS) \
         , $(evalvalctx def_unit_qt4_target_pre_handle_moc_hdr))
@@ -882 +882 @@
 # ASSUMES (_ALL_)INSTALLS is processed after the targets using this unit.
 local translations := \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg_arch)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg).$(_bld_trg_arch)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_trg_cpu)) \
-        $($(target)_QT_TRANSLATIONS.$(_bld_type)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg_arch)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_trg_cpu)) \
+        $($(target)_QT_TRANSLATIONS.$(bld_type)) \
         $($(target)_QT_TRANSLATIONS)
 ifneq ($(strip $(translations)),)