Changeset 3301 for trunk/kBuild/units

Timestamp:

Nov 5, 2019, 12:07:00 PM (6 years ago)

Author:

bird

Message:

units/qt5.kmk: Pick up target INTERMEDIATES in the moc rules. Wasn't done earlier as it was complicated by the fact that we were adding the MOC output to the intermediates, creating circular dependencies.

File:

• trunk/kBuild/units/qt5.kmk (modified) (3 diffs)

trunk/kBuild/units/qt5.kmk

@@ -807 +807 @@
                 $(value _UNIT_QT5_MOC_HPP_CMDS_DEP) \
                 | \
-                $(orderdeps)
+                $(orderdeps) $(my_target_intermediate_vars)
         %$$(call MSG_TOOL,moc,$(target),$(source),$$@)
         $(QUIET2)$(RM) -f $(out) $(more_output) $(maybe_output) $(dep)
@@ -907 +907 @@
                 $(value _UNIT_QT5_MOC_CPP_CMDS_DEP) \
                 | \
-                $(orderdeps)
+                $(orderdeps) $(my_target_intermediate_vars)
         %$$(call MSG_TOOL,moc,$(target),$(source),$$@)
         $(QUIET2)$(RM) -f $(out) $(more_output) $(maybe_output) $(dep)
@@ -1090 +1090 @@
 $(eval $(target)_INCS    += $(qtmocdir) $(qtuicdir))
 
+# Since we add a lot of stuff to 2_INTERMEDIATES, we must exclude it from the intermediates
+# used by the rules we generate to avoid circular dependencies.
+local my_target_intermediate_vars := $(filter-out %_2_INTERMEDIATES$(CLOSEPAR),$(target_intermediate_vars))
+
 # Deal with QT_MOCSRCS.
 $(foreach source, \