[Libreoffice-commits] .: bean/Library_officebean.mk codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk cosv/StaticLibrary_cosv.mk extensions/StaticLibrary_npsoenv.mk l10ntools/StaticLibrary_transex.mk np_sdk/StaticLibrary_nputils.mk pyuno/Library_pyuno_wrapper.mk registry/StaticLibrary_registry_helper.mk sdext/Executable_xpdfimport.mk tools/StaticLibrary_ooopathutils.mk udm/StaticLibrary_udm.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Oct 31 11:12:36 PDT 2012 

 bean/Library_officebean.mk                |    5 +++++
 codemaker/StaticLibrary_codemaker.mk      |    1 +
 codemaker/StaticLibrary_codemaker_cpp.mk  |    2 ++
 codemaker/StaticLibrary_codemaker_java.mk |    2 ++
 cosv/StaticLibrary_cosv.mk                |    2 ++
 extensions/StaticLibrary_npsoenv.mk       |    4 ++++
 l10ntools/StaticLibrary_transex.mk        |    5 +++++
 np_sdk/StaticLibrary_nputils.mk           |    5 +++++
 pyuno/Library_pyuno_wrapper.mk            |    5 +++++
 registry/StaticLibrary_registry_helper.mk |    5 +++++
 sdext/Executable_xpdfimport.mk            |    5 +++++
 tools/StaticLibrary_ooopathutils.mk       |    5 ++++-
 udm/StaticLibrary_udm.mk                  |    2 ++
 13 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit f09e4ae2737acb4b3e309e7342162439904939a1
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 27 16:57:10 2012 +0200

    add missing deps on sal headers
    
    Change-Id: I815ef8abaf4cd998e7b91fbadad56ddf0a7087ba

diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index d17f795..1c3fb1f 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -31,6 +31,11 @@
 $(eval $(call gb_Library_Library,officebean))
 
 ifeq ($(GUI),UNX)
+$(eval $(call gb_Library_use_packages,officebean,\
+	sal_generated \
+	sal_inc \
+))
+
 $(eval $(call gb_Library_add_cobjects,officebean,\
 	bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \
 	bean/native/unix/com_sun_star_beans_LocalOfficeWindow \
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index 04b53db..e0eab49 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker,\
 	codemaker_inc \
 	registry_inc \
 	sal_generated \
+	sal_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index 92678fa..0e08444 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
     codemaker_inc \
     registry_inc \
+	sal_generated \
+	sal_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 f33d38e..37e8e8d 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
     codemaker_inc \
 	registry_inc \
+	sal_generated \
+	sal_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk
index d6f3229..666da6b 100644
--- a/cosv/StaticLibrary_cosv.mk
+++ b/cosv/StaticLibrary_cosv.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cosv))
 
 $(eval $(call gb_StaticLibrary_use_packages,cosv,\
 	cosv_inc \
+	sal_generated \
+	sal_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\
diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk
index 3a1abe6..e0383da 100644
--- a/extensions/StaticLibrary_npsoenv.mk
+++ b/extensions/StaticLibrary_npsoenv.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,npsoenv))
 
+$(eval $(call gb_StaticLibrary_use_packages,npsoenv,\
+    sal_inc \
+))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\
 	extensions/source/nsplugin/source/so_env \
 ))
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
index b437be9..4996b05 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,transex))
 
+$(eval $(call gb_StaticLibrary_use_packages,transex,\
+	sal_generated \
+	sal_inc \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,transex,\
     -I$(SRCDIR)/l10ntools/inc \
     $$(INCLUDE) \
diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index 77b1e2d..824c268 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
 
+$(eval $(call gb_StaticLibrary_use_packages,nputils,\
+	sal_generated \
+	sal_inc \
+))
+
 $(eval $(call gb_StaticLibrary_use_externals,nputils,\
 	mozilla_headers \
 ))
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index 8ec4a10..2c44a6f 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -26,6 +26,11 @@
 
 $(eval $(call gb_Library_Library,pyuno_wrapper))
 
+$(eval $(call gb_Library_use_packages,pyuno_wrapper,\
+    sal_generated \
+    sal_inc \
+))
+
 $(eval $(call gb_Library_set_include,pyuno_wrapper,\
     -I$(SRCDIR)/pyuno/source/module \
     -I$(SRCDIR)/pyuno/inc \
diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk
index a7d4671..07469df 100644
--- a/registry/StaticLibrary_registry_helper.mk
+++ b/registry/StaticLibrary_registry_helper.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,registry_helper))
 
+$(eval $(call gb_StaticLibrary_use_packages,registry_helper,\
+	sal_generated \
+	sal_inc \
+))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,registry_helper,\
     registry/tools/fileurl \
     registry/tools/options \
diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk
index 566baf7..f333ef9 100644
--- a/sdext/Executable_xpdfimport.mk
+++ b/sdext/Executable_xpdfimport.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_Executable_Executable,xpdfimport))
 
+$(eval $(call gb_Executable_use_packages,xpdfimport,\
+    sal_generated \
+    sal_inc \
+))
+
 $(eval $(call gb_Executable_use_externals,xpdfimport,\
     poppler \
     zlib \
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index 3495f8c..79948e9 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -19,7 +19,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
 
-$(eval $(call gb_StaticLibrary_use_package,ooopathutils,tools_inc))
+$(eval $(call gb_StaticLibrary_use_packages,ooopathutils,\
+	sal_inc \
+	tools_inc \
+))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
     tools/source/misc/pathutils \
diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk
index 3901a45..8b43c8f 100644
--- a/udm/StaticLibrary_udm.mk
+++ b/udm/StaticLibrary_udm.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm))
 
 $(eval $(call gb_StaticLibrary_use_packages,udm,\
 	cosv_inc \
+	sal_generated \
+	sal_inc \
 	udm_inc \
 ))

More information about the Libreoffice-commits mailing list