[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 3 commits - animations/Library_animcore.mk basegfx/Library_basegfx.mk codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk starmath/Module_starmath.mk xmlscript/Library_xmlscript.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 17 12:50:37 PDT 2012
animations/Library_animcore.mk | 5 ++++-
basegfx/Library_basegfx.mk | 1 +
codemaker/Executable_cppumaker.mk | 5 -----
codemaker/Executable_javamaker.mk | 5 -----
codemaker/StaticLibrary_codemaker.mk | 6 +-----
codemaker/StaticLibrary_codemaker_cpp.mk | 5 ++---
codemaker/StaticLibrary_codemaker_java.mk | 5 ++---
starmath/Module_starmath.mk | 8 ++++----
xmlscript/Library_xmlscript.mk | 5 ++++-
9 files changed, 18 insertions(+), 27 deletions(-)
New commits:
commit 27a53dbc352ade07fd49b815876235fd0057c3c3
Author: David Tardon <dtardon at redhat.com>
Date: Mon Sep 17 18:47:50 2012 +0200
use package instead of explicit include path
Change-Id: I11048d24b21549aa3ae79995a2c252c00e56d771
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index 69293e2..e3ab77d 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -26,11 +26,6 @@
$(eval $(call gb_Executable_Executable,cppumaker))
-$(eval $(call gb_Executable_set_include,cppumaker,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_use_libraries,cppumaker,\
reg \
sal \
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
index cd5a1aa..2997e37 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -26,11 +26,6 @@
$(eval $(call gb_Executable_Executable,javamaker))
-$(eval $(call gb_Executable_set_include,javamaker,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_use_libraries,javamaker,\
reg \
sal \
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index c55209f..bbea555 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -28,14 +28,10 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
$(eval $(call gb_StaticLibrary_use_packages,codemaker,\
+ codemaker_inc \
sal_generated \
))
-$(eval $(call gb_StaticLibrary_set_include,codemaker,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
codemaker/source/codemaker/dependencies \
codemaker/source/codemaker/exceptiontree \
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index 3f18114..b8cabf4 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -27,9 +27,8 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
-$(eval $(call gb_StaticLibrary_set_include,codemaker_cpp,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
+$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
+ codemaker_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 b9e2396..6538e38 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -27,9 +27,8 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
-$(eval $(call gb_StaticLibrary_set_include,codemaker_java,\
- -I$(SRCDIR)/codemaker/inc \
- $$(INCLUDE) \
+$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
+ codemaker_inc \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\
commit 57a7cae9be3fcf9f0c3c247a41a35298e429a3d8
Author: David Tardon <dtardon at redhat.com>
Date: Mon Sep 17 11:38:09 2012 +0200
make starmath's gbuild module name the same as dir
Otherwise make starmath.all does not work as expected.
Change-Id: I747b7dd9f1cd6347d6fe8d5edbbb0dff079a253b
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index cbee845..bb86634 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -21,20 +21,20 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Module_Module,sm))
+$(eval $(call gb_Module_Module,starmath))
-$(eval $(call gb_Module_add_targets,sm,\
+$(eval $(call gb_Module_add_targets,starmath,\
AllLangResTarget_sm \
Library_sm \
Library_smd \
Package_uiconfig \
))
-#$(eval $(call gb_Module_add_check_targets,sm,\
+#$(eval $(call gb_Module_add_check_targets,starmath,\
# CppunitTest_starmath_qa_cppunit \
#))
-$(eval $(call gb_Module_add_subsequentcheck_targets,sm,\
+$(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
JunitTest_starmath_unoapi \
))
commit 3f904a0870a5576a56ac5f64c7cb84ad5cd029b9
Author: David Tardon <dtardon at redhat.com>
Date: Sun Sep 16 15:32:34 2012 +0200
add missing deps on headers
Change-Id: Icaeba832c527ba81a9f152ea011548e8b9843b5e
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 1ff89b4..013704d 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -28,7 +28,10 @@
$(eval $(call gb_Library_Library,animcore))
-$(eval $(call gb_Library_use_package,animcore,animations_inc))
+$(eval $(call gb_Library_use_packages,animcore,\
+ animations_inc \
+ comphelper_inc \
+))
$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index c2c9230..60f81a8 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,basegfx))
$(eval $(call gb_Library_use_packages,basegfx,\
basegfx_inc \
+ comphelper_inc \
o3tl_inc \
))
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index b2f9db4..2ca986a 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -9,7 +9,10 @@
$(eval $(call gb_Library_Library,xmlscript))
-$(eval $(call gb_Library_use_package,xmlscript,xmlscript_inc))
+$(eval $(call gb_Library_use_packages,xmlscript,\
+ tools_inc \
+ xmlscript_inc \
+))
$(eval $(call gb_Library_set_componentfile,xmlscript,xmlscript/util/xmlscript))
More information about the Libreoffice-commits
mailing list