Changeset 1683

Timestamp:

07/15/08 04:25:16 (3 months ago)

Author:

bird

Message:

qt4 unit: some qt -> qt4 fixes. separate the moc cmd deps.

Files:

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

trunk/kBuild/units/qt4.kmk

@@ -306 +306 @@
 ## wrapper for the lrelease (LRC) command dependencies.
 ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_LRC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_LRC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_LRC_CMDS_DEP =
+ _UNIT_QT4_LRC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT4_LRC_CMDS_PREV_),$$(commands $(out)),FORCE)
+else
+ _UNIT_QT4_LRC_CMDS_DEP =
 endif
 
@@ -322 +322 @@
 $(out) + $(more_output) +| $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_LRC_CMDS_DEP) \
+                $(value _UNIT_QT4_LRC_CMDS_DEP) \
                 | \
                 $(orderdeps)
@@ -332 +332 @@
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_LRC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT4_LRC_CMDS_PREV_'
         %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
@@ -392 +392 @@
 ## wrapper for the UIC command dependencies.
 ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_RCC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_RCC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_RCC_CMDS_DEP =
+ _UNIT_QT4_RCC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT4_RCC_CMDS_PREV_),$$(commands $(out)),FORCE)
+else
+ _UNIT_QT4_RCC_CMDS_DEP =
 endif
 
@@ -408 +408 @@
 $(out) +| $(realout) $(more_output) $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_RCC_CMDS_DEP) \
+                $(value _UNIT_QT4_RCC_CMDS_DEP) \
                 | \
                 $(orderdeps)
@@ -419 +419 @@
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_RCC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT4_RCC_CMDS_PREV_'
         %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
@@ -478 +478 @@
 ## wrapper for the UIC command dependencies.
 ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_UIC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_UIC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_UIC_CMDS_DEP =
+ _UNIT_QT4_UIC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT4_UIC_CMDS_PREV_),$$(commands $(out)),FORCE)
+else
+ _UNIT_QT4_UIC_CMDS_DEP =
 endif
 
@@ -494 +494 @@
 $(out) +| $(realout) $(more_output) $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_UIC_CMDS_DEP) \
+                $(value _UNIT_QT4_UIC_CMDS_DEP) \
                 | \
                 $(orderdeps)
@@ -505 +505 @@
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_UIC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT4_UIC_CMDS_PREV_'
         %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
@@ -563 +563 @@
 ## wrapper for the MOC command dependencies.
 ifndef NO_COMPILE_CMDS_DEPS
- _UNIT_QT_MOC_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT_MOC_CMDS_PREV_),$$(commands $(out)),FORCE)
-else
- _UNIT_QT_MOC_CMDS_DEP =
+ _UNIT_QT4_MOC_HPP_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT4_MOC_HPP_CMDS_PREV_),$$(commands $(out)),FORCE)
+else
+ _UNIT_QT4_MOC_HPP_CMDS_DEP =
 endif
 
@@ -579 +579 @@
 $(out) +| $(realout) $(more_output) $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_MOC_CMDS_DEP) \
+                $(value _UNIT_QT4_MOC_HPP_CMDS_DEP) \
                 | \
                 $(orderdeps)
@@ -590 +590 @@
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_MOC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT4_MOC_HPP_CMDS_PREV_'
         %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'
@@ -602 +602 @@
 
 ##
-# Handle a source file listed in QT_MOCHDRSS.
+# Handle a source file listed in QT_MOCHDRS.
 #
 # The files listed in QT_MOCHDRS uses the Q_OBJECT macro and we will
@@ -653 +653 @@
 
 
+## wrapper for the MOC command dependencies.
+ifndef NO_COMPILE_CMDS_DEPS
+ _UNIT_QT4_MOC_CPP_CMDS_DEP = $$(comp-cmds-ex $$($(target)_$(subst :,_,$(source))_QT4_MOC_CPP_CMDS_PREV_),$$(commands $(out)),FORCE)
+else
+ _UNIT_QT4_MOC_CPP_CMDS_DEP =
+endif
+
 ##
 # def_unit_qt4_target_pre_handle_moc_src helper that is expanded before evaluation.
@@ -664 +671 @@
 $(out) +| $(realout) $(more_output) $(maybe_output): \
                 $(deps) \
-                $(value _UNIT_QT_MOC_CMDS_DEP) \
+                $(value _UNIT_QT4_MOC_CPP_CMDS_DEP) \
                 | \
                 $(orderdeps)
@@ -675 +682 @@
 ifndef NO_COMPILE_CMDS_DEPS
         %$$(QUIET2)$$(APPEND) '$(dep)'
-        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT_MOC_CMDS_PREV_'
+        %$$(QUIET2)$$(APPEND) '$(dep)' 'define $(target)_$(subst :,_,$(source))_QT4_MOC_CPP_CMDS_PREV_'
         %$$(QUIET2)$$(APPEND) -c '$(dep)' '$(out)'
         %$$(QUIET2)$$(APPEND) '$(dep)' 'endef'