gbuild: UnoApi: fix header rebuilds when cppumaker changes

There needs to be a dependency from the header on cppumaker, because
headers do get rebuilt in this case and it's possible that the content
chnaged; unfortunately it's not possible to tell whether the content
of the headers actually did change, all of them will be touched which
will result in a large rebuild.

Change-Id: I78ae0631ba9197ca3d3edbd010319b77a6f01074

solenv/gbuild/UnoApiTarget.mk

@@ -176,28 +176,34 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS :=
 # need dummy recipes so that header files are delivered in Package_inc;
 # otherwise make will consider the header to be up-to-date because it was
 # actually built by the recipe for gb_UnoApiHeadersTarget_get_target
-$(call gb_UnoApiHeadersTarget_get_real_dir,$(1))/%.hdl :| \
-		$(call gb_UnoApiHeadersTarget_get_real_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_real_dir,$(1))/%.hdl : \
+		$(call gb_Executable_get_target_for_build,cppumaker) \
+		| $(call gb_UnoApiHeadersTarget_get_real_target,$(1))
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_real_dir,$(1))/%.hpp :| \
-		$(call gb_UnoApiHeadersTarget_get_real_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_real_dir,$(1))/%.hpp : \
+		$(call gb_Executable_get_target_for_build,cppumaker) \
+		| $(call gb_UnoApiHeadersTarget_get_real_target,$(1))
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_real_bootstrap_dir,$(1))/%.hdl :| \
-		$(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_real_bootstrap_dir,$(1))/%.hdl : \
+		$(call gb_Executable_get_target_for_build,cppumaker) \
+		| $(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,$(1))
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_real_bootstrap_dir,$(1))/%.hpp :| \
-		$(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_real_bootstrap_dir,$(1))/%.hpp : \
+		$(call gb_Executable_get_target_for_build,cppumaker) \
+		| $(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,$(1))
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hdl :| \
-		$(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hdl : \
+		$(call gb_Executable_get_target_for_build,cppumaker) \
+		| $(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hpp :| \
-		$(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_real_comprehensive_dir,$(1))/%.hpp : \
+		$(call gb_Executable_get_target_for_build,cppumaker) \
+		| $(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,$(1))
 	touch $$@
 
 endef