[Libreoffice-commits] .: 3 commits - cosv/StaticLibrary_cosv.mk cross_toolset/prj Module_cross_tail_build.mk Module_tail_build.mk udm/StaticLibrary_udm.mk

[David Tardon]

 Module_cross_tail_build.mk  |    3 +++
 Module_tail_build.mk        |    3 +++
 cosv/StaticLibrary_cosv.mk  |    5 ++---
 cross_toolset/prj/build.lst |    2 +-
 udm/StaticLibrary_udm.mk    |    5 ++++-
 5 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 8ee8300ca9f7e3355a671bd4cfae59e0fddbec41
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 2 17:58:12 2012 +0200

    add autodoc and its deps to cross_tail_build
    
    Change-Id: I39c7f026576f1815ed7f683f0f039b2d074840cf

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index dba4eec..f0e5ca0 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -28,8 +28,10 @@
 $(eval $(call gb_Module_Module,cross_tail_build))
 
 $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
+	autodoc \
 	basegfx \
 	binaryurp \
+	cosv \
 	i18npool \
 	i18nutil \
 	idl \
@@ -49,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	sax \
 	shell \
 	tools \
+	udm \
 	unoil \
 	unotest \
 	unotools \
diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst
index 2883e64..e720231 100644
--- a/cross_toolset/prj/build.lst
+++ b/cross_toolset/prj/build.lst
@@ -1 +1 @@
-crs	cross_toolset	::	autodoc setup_native cross_tail_build NULL
+crs	cross_toolset	::	setup_native cross_tail_build NULL
commit bcd0b2a9ff3f96be9a54f75a916d53d2dc66954d
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 2 17:57:23 2012 +0200

    add autodoc and its deps to tail_build
    
    Change-Id: I4a5e960c13b5f17235dc50f8ee6754a029c70840

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index bdd7ef1..cbc0462 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     accessibility \
     animations \
     apple_remote \
+	autodoc \
     avmedia \
     basctl \
     basebmp \
@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     chart2 \
     configmgr \
     connectivity \
+	cosv \
     cppcanvas \
 	cpputools \
     cui \
@@ -119,6 +121,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     tubes \
     twain \
     ucb \
+	udm \
     unixODBC \
     UnoControls \
     unodevtools \
commit 75c3e803316f307d02569485e6e00aa04ec6dc09
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 2 18:03:22 2012 +0200

    make sure headers are in place when the libs are used
    
    Change-Id: I18c21d46153ef6be728dc3d8335e9c06cc7f3ad3

diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk
index 32b9a05..d6f3229 100644
--- a/cosv/StaticLibrary_cosv.mk
+++ b/cosv/StaticLibrary_cosv.mk
@@ -9,9 +9,8 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,cosv))
 
-$(eval $(call gb_StaticLibrary_set_include,cosv,\
-    -I$(SRCDIR)/cosv/inc \
-    $$(INCLUDE) \
+$(eval $(call gb_StaticLibrary_use_packages,cosv,\
+	cosv_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\
diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk
index 6077a47..01fe7ee 100644
--- a/udm/StaticLibrary_udm.mk
+++ b/udm/StaticLibrary_udm.mk
@@ -9,8 +9,11 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,udm))
 
+$(eval $(call gb_StaticLibrary_use_packages,udm,\
+	udm_inc \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,udm,\
-    -I$(SRCDIR)/udm/inc \
     -I$(SRCDIR)/udm/source/inc \
     $$(INCLUDE) \
 ))