add missing deps on headers to static libs

Change-Id: I7a28dfa13bf0f98a654eca98eb1cdfd99177f37a

10 files changed, 53 insertions, 0 deletions

diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index bbea555a5d18..04b53db236af 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker,\
 	codemaker_inc \
+	registry_inc \
 	sal_generated \
 ))
 
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index b8cabf468a88..92678fa01a44 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
     codemaker_inc \
+    registry_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 6538e380496a..f33d38e14009 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
     codemaker_inc \
+	registry_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index 3bc66a25a5c3..9767efa4e67a 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -27,6 +27,16 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu))
 
+$(eval $(call gb_StaticLibrary_use_packages,ulingu,\
+	comphelper_inc \
+	cppu_inc \
+	cppuhelper_inc \
+	i18npool_inc \
+	linguistic_inc \
+	tools_inc \
+	unotools_inc \
+))
+
 $(eval $(call gb_StaticLibrary_use_api,ulingu,\
 	udkapi \
 	offapi \
diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk
index cdbc3c88843f..bf6887c00ada 100644
--- a/sax/StaticLibrary_sax_shared.mk
+++ b/sax/StaticLibrary_sax_shared.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared))
 
+$(eval $(call gb_StaticLibrary_use_packages,sax_shared,\
+	cppu_inc \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,sax_shared,\
     -I$(SRCDIR)/sax/inc \
     $$(INCLUDE) \
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 20065a9100bb..bf49da31070b 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -30,6 +30,11 @@ include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
 $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
 
 $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
+    basegfx_inc \
+    comphelper_inc \
+    cppu_inc \
+    cppuhelper_inc \
+    o3tl_inc \
     tools_inc \
 ))
 
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index ed96f3489f42..23254e7f13a8 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s))
 
+$(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\
+	cppu_inc \
+	cppuhelper_inc \
+))
+
 $(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\
     bridgetest \
 ))
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index a07497ceb7a3..a3dc220a83cd 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -28,6 +28,19 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,headless))
 
+$(eval $(call gb_StaticLibrary_use_packages,headless,\
+	basebmp_inc \
+	basegfx_inc \
+	comphelper_inc \
+	cppu_inc \
+	cppuhelper_inc \
+	i18npool_inc \
+	i18nutil_inc \
+	o3tl_inc \
+	tools_inc \
+	unotools_inc \
+))
+
 $(eval $(call gb_StaticLibrary_use_api,headless,\
     offapi \
     udkapi \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 05a6f3e9fe97..98998bb52e93 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -29,6 +29,9 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
 $(eval $(call gb_StaticLibrary_use_packages,vclmain,\
+	comphelper_inc \
+	cppu_inc \
+	cppuhelper_inc \
 	tools_inc \
 ))
 
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index 6aec3aeaf98b..995b1bab2f35 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -19,6 +19,16 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
 
+$(eval $(call gb_StaticLibrary_use_packages,writerperfect,\
+	comphelper_inc \
+	cppu_inc \
+	cppuhelper_inc \
+	sot_inc \
+	tools_inc \
+	unotools_inc \
+	xmloff_inc \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,writerperfect,\
 	$$(INCLUDE) \
     -I$(SRCDIR)/writerperfect/source \