simplify makefiles

Change-Id: I11ea8814d36cdc6d6838ec80b0bbb272d3116b2d

4 files changed, 16 insertions, 24 deletions

diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk
index bfd4dad5e47a..fe2c40f30430 100644
--- a/cppu/CppunitTest_cppu_checkapi.mk
+++ b/cppu/CppunitTest_cppu_checkapi.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,cppu_checkapi))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,cppu_checkapi,\
+	cppu/allheaders \
+))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,cppu_checkapi,\
     cppu/qa/checkapi/strings \
 ))
@@ -36,12 +40,6 @@ $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_checkapi, \
 	udkapi \
 ))
 
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) : \
-	INCLUDE += -I$(call gb_CustomTarget_get_workdir,cppu/allheaders)
-$(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \
-	$(call gb_CustomTarget_get_workdir,cppu/allheaders)/cppu_allheaders.hxx
-
 $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\
     cppu \
 	$(gb_UWINAPI) \
diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
index 5e933d3fbe34..f8042b70e558 100644
--- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_checkapi))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,cppuhelper_checkapi,\
+	cppuhelper/allheaders \
+))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_checkapi,\
     cppuhelper/qa/checkapi/strings \
 ))
@@ -36,12 +40,6 @@ $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppuhelper_checkapi,
 	udkapi \
 ))
 
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) : \
-	INCLUDE += -I$(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)
-$(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \
-	$(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)/cppuhelper_allheaders.hxx
-
 $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\
     cppuhelper \
 	$(gb_UWINAPI) \
diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk
index 4feec9b2911d..42fd5e354d94 100644
--- a/sal/CppunitTest_sal_checkapi.mk
+++ b/sal/CppunitTest_sal_checkapi.mk
@@ -27,18 +27,16 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sal_checkapi))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,sal_checkapi,\
+	sal/allheaders \
+))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sal_checkapi,\
     sal/qa/checkapi/strings \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,sal_checkapi,boost_headers))
 
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,sal/qa/checkapi/strings) : \
-	INCLUDE += -I$(call gb_CustomTarget_get_workdir,sal/allheaders)
-$(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \
-	$(call gb_CustomTarget_get_workdir,sal/allheaders)/sal_allheaders.hxx
-
 $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\
     sal \
 	$(gb_UWINAPI) \
diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk
index 3fd31787da7a..fed7e58a2444 100644
--- a/salhelper/CppunitTest_salhelper_checkapi.mk
+++ b/salhelper/CppunitTest_salhelper_checkapi.mk
@@ -27,18 +27,16 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,salhelper_checkapi))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,salhelper_checkapi,\
+	salhelper/allheaders \
+))
+
 $(eval $(call gb_CppunitTest_use_external,salhelper_checkapi,boost_headers))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,salhelper_checkapi,\
     salhelper/qa/checkapi/strings \
 ))
 
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) : \
-	INCLUDE += -I$(call gb_CustomTarget_get_workdir,salhelper/allheaders)
-$(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \
-	$(call gb_CustomTarget_get_workdir,salhelper/allheaders)/salhelper_allheaders.hxx
-
 $(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\
     salhelper \
 	$(gb_UWINAPI) \