[Libreoffice-commits] core.git: 15 commits - bean/Library_officebean.mk desktop/Executable_unopkg.com.mk desktop/Executable_unopkg.mk desktop/StaticLibrary_winextendloaderenv.mk dtrans/StaticLibrary_dtobj.mk embedserv/Library_inprocserv.mk lingucomponent/StaticLibrary_ulingu.mk sal/Library_uwinapi.mk sax/StaticLibrary_sax_shared.mk sdext/StaticLibrary_pdfimport_s.mk solenv/gbuild tools/StaticLibrary_ooopathutils.mk vcl/StaticLibrary_vclmain.mk writerperfect/StaticLibrary_writerperfect.mk

David Tardon dtardon at redhat.com
Thu Mar 28 00:59:51 PDT 2013 

 bean/Library_officebean.mk                   |    8 ++++----
 desktop/Executable_unopkg.com.mk             |    5 +++++
 desktop/Executable_unopkg.mk                 |    4 ++++
 desktop/StaticLibrary_winextendloaderenv.mk  |    6 ++++++
 dtrans/StaticLibrary_dtobj.mk                |   12 +++++++++---
 embedserv/Library_inprocserv.mk              |    1 +
 lingucomponent/StaticLibrary_ulingu.mk       |    2 ++
 sal/Library_uwinapi.mk                       |    6 ++++++
 sax/StaticLibrary_sax_shared.mk              |    2 ++
 sdext/StaticLibrary_pdfimport_s.mk           |    6 ++++++
 solenv/gbuild/InstallScript.mk               |    1 +
 tools/StaticLibrary_ooopathutils.mk          |    1 +
 vcl/StaticLibrary_vclmain.mk                 |    2 ++
 writerperfect/StaticLibrary_writerperfect.mk |    2 ++
 14 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit 6fd2146cb804cf3250eb6888f63391c30fd3b484
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:45:32 2013 +0100

    add missing dep on jawt
    
    Change-Id: Ie6c552976f2f1027602a5b4ba27ba4754ec9dd69

diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index cfc0caf..f76f224 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -30,16 +30,16 @@
 
 $(eval $(call gb_Library_Library,officebean))
 
+$(eval $(call gb_Library_use_externals,officebean,\
+	jawt \
+))
+
 ifneq ($(OS),WNT)
 $(eval $(call gb_Library_use_packages,officebean,\
 	sal_generated \
 	sal_odk_headers \
 ))
 
-$(eval $(call gb_Library_use_externals,officebean,\
-	jawt \
-))
-
 $(eval $(call gb_Library_add_cobjects,officebean,\
 	bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \
 	bean/native/unix/com_sun_star_beans_LocalOfficeWindow \
commit 2d7d465ee052bb95584ebdd4f3bc589972245726
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:25:54 2013 +0100

    add missing dep on comphelper/classids.hxx
    
    Change-Id: Ibe2fe28c19010fa8844db3ad912e9a5dc9305cad

diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk
index 32011b0..c016355 100644
--- a/embedserv/Library_inprocserv.mk
+++ b/embedserv/Library_inprocserv.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\
 ))
 
 $(eval $(call gb_Library_use_packages,inprocserv,\
+	comphelper_inc \
 	sal_odk_headers \
 ))
 
commit a91559dee5ecab287e25a75dc83cf6affa714414
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:21:49 2013 +0100

    add missing dep on sal/typesizes.h
    
    Change-Id: I45e2949bd50ef1b72e40f6dbc67a05bbbbeeeb5b

diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index bd4db5c..d83bb63 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,uwinapi))
 
 $(eval $(call gb_Library_use_packages,uwinapi,\
 	sal_inc \
+	sal_generated \
 	sal_odk_headers \
 ))
 
commit a11189ce7291c91c5c4e4e253e24d3c75bbad174
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:18:02 2013 +0100

    add missing dep on sal/config.h
    
    Change-Id: I6f1e3eddc960b5010e9bf015ba426aefd0437bc1

diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index 9762184..4f3e97a 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_StaticLibrary_use_packages,writerperfect,\
 	comphelper_inc \
 	cppu_odk_headers \
 	cppuhelper_odk_headers \
+	sal_generated \
+	sal_odk_headers \
 	sot_inc \
 	tools_inc \
 	unotools_inc \
commit 02474e0edd38c0e5959449191aef1cc5a03faa9b
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:14:35 2013 +0100

    add missing deps on headers
    
    Change-Id: I4e16a271533fdc1fa51f9539b38220330cc44276

diff --git a/desktop/StaticLibrary_winextendloaderenv.mk b/desktop/StaticLibrary_winextendloaderenv.mk
index aad9e80..33dab8c 100644
--- a/desktop/StaticLibrary_winextendloaderenv.mk
+++ b/desktop/StaticLibrary_winextendloaderenv.mk
@@ -27,6 +27,12 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,winextendloaderenv))
 
+$(eval $(call gb_StaticLibrary_use_packages,winextendloaderenv,\
+	sal_generated \
+	sal_odk_headers \
+	tools_inc \
+))
+
 $(eval $(call gb_StaticLibrary_add_noexception_objects,winextendloaderenv,\
     desktop/win32/source/extendloaderenvironment \
 ))
commit 09505a2f05da8dd43027db1c9deaaaf7e67994c2
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:11:53 2013 +0100

    add missing dep on sal/config.h
    
    Change-Id: I2df7a90f09c9692c9cc28fe0f6e5f0a56673811e

diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index b7198c7..81491d6 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_StaticLibrary_use_packages,vclmain,\
 	comphelper_inc \
 	cppu_odk_headers \
 	cppuhelper_odk_headers \
+	sal_generated \
+	sal_odk_headers \
 	tools_inc \
 ))
 
commit 580c6399974b4d80b5b2a8c0b950736f2d53acb2
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:07:57 2013 +0100

    add missing dep on osl/thread.h
    
    Change-Id: I4c33ed5a9ae5a29c2deb1a7f7d3ef1a11a44c539

diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index 318f36b..a7aa35f 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_StaticLibrary_use_packages,ulingu,\
 	cppuhelper_odk_headers \
 	i18npool_inc \
 	linguistic_inc \
+	sal_generated \
+	sal_odk_headers \
 	tools_inc \
 	unotools_inc \
 ))
commit 4b45fe583e781bc14b715541caf92ed5ae744186
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 08:01:33 2013 +0100

    add missing dep on sal/types.h
    
    Change-Id: I76ab0b77a9d68feac2f14dc2f45c9bb39c15e585

diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk
index 5fb6cab..a1fd8e0 100644
--- a/sax/StaticLibrary_sax_shared.mk
+++ b/sax/StaticLibrary_sax_shared.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared))
 
 $(eval $(call gb_StaticLibrary_use_packages,sax_shared,\
 	cppu_odk_headers \
+	sal_generated \
+	sal_odk_headers \
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,sax_shared,\
commit 820f596b740a234c4266e05ed91c3a208610e4c9
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 07:58:45 2013 +0100

    add missing deps on headers
    
    Change-Id: Ifdc86edf9885d5c5bad158838093f7eff02c6ef3

diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 82256e2..e208e86 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -32,8 +32,14 @@ $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
     comphelper_inc \
     cppu_odk_headers \
     cppuhelper_odk_headers \
+	i18npool_inc \
     o3tl_inc \
+	rsc_inc \
+	sal_generated \
+	sal_odk_headers \
     tools_inc \
+	unotools_inc \
+	vcl_inc \
 ))
 
 $(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\
commit 876537a1ed6b06357996d3ba1da694a72b29123c
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 07:48:02 2013 +0100

    add missing deps on URE headers
    
    Change-Id: Id432ade1703e50a0abe1642e2e1eba89dc102dee

diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
index cdc4a2d..e275021 100644
--- a/dtrans/StaticLibrary_dtobj.mk
+++ b/dtrans/StaticLibrary_dtobj.mk
@@ -28,11 +28,17 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj))
 
-$(eval $(call gb_StaticLibrary_use_api,dtobj,\
-	udkapi \
-	offapi \
+$(eval $(call gb_StaticLibrary_use_packages,dtobj,\
+	comphelper_inc \
+	cppu_odk_headers \
+	cppuhelper_odk_headers \
+	sal_generated \
+	sal_inc \
+	sal_odk_headers \
 ))
 
+$(eval $(call gb_StaticLibrary_use_sdk_api,dtobj))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\
 	dtrans/source/win32/dtobj/APNDataObject \
 	dtrans/source/win32/dtobj/DataFmtTransl \
commit 1fdf63282bc0429b07ba697f1aabbca10a7b8d6b
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 07:38:13 2013 +0100

    add missing dep on uwinapi.h
    
    Change-Id: Ie7a616d4295db98a8c513e876b83b8e6b52ba83a

diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index 27611ea..3b8fb66 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Executable_Executable,unopkg))
 
+$(eval $(call gb_Executable_use_packages,unopkg,\
+    sal_inc \
+))
+
 $(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
 
 $(eval $(call gb_Executable_use_static_libraries,unopkg,\
commit e8b8e33c29fae829ba22f575cf04d79c202eb1fe
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 07:35:40 2013 +0100

    add missing dep on sal headers
    
    Change-Id: Iffcd9b94b1246c012413f26cf11c1bb28541d38b

diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index 946e579..358b05d 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_Executable_Executable,unopkg_com))
 
+$(eval $(call gb_Executable_use_packages,unopkg_com,\
+    sal_inc \
+    sal_odk_headers \
+))
+
 $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
 
 $(eval $(call gb_Executable_add_defs,unopkg_com,\
commit 52a29f6d3c3fa943a41648601167dee9f2ac6a24
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 07:31:54 2013 +0100

    add missing dep on sal/typesizes.h
    
    Change-Id: I1b840d53259c92bf5336e7815c726154c2323f2a

diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index d9299f8..6919795 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -20,6 +20,7 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
 
 $(eval $(call gb_StaticLibrary_use_packages,ooopathutils,\
+	sal_generated \
 	sal_odk_headers \
 	tools_inc \
 ))
commit 27b8de356e0df5f6b646050a965529e233c16efc
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 07:26:52 2013 +0100

    make sure output dir exists
    
    Change-Id: I437c54719a514fdc020b3a6bf37d2f288102fdea

diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index e3b56f4..556113c 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -101,6 +101,7 @@ define gb_InstallScript_InstallScript
 $(call gb_InstallScriptTarget_InstallScriptTarget,$(1))
 
 $(call gb_InstallScript_get_target,$(1)) : $(call gb_InstallScriptTarget_get_target,$(1))
+$(call gb_InstallScript_get_target,$(1)) :| $(dir $(call gb_InstallScript_get_target,$(1))).dir
 $(call gb_InstallScript_get_clean_target,$(1)) : $(call gb_InstallScriptTarget_get_clean_target,$(1))
 
 $(call gb_Deliver_add_deliverable,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScriptTarget_get_target,$(1)),$(1))
commit 1e3c9641f05116d44388fdee139f469c6fe282c2
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 28 07:22:47 2013 +0100

    add missing deps on uwinapi headers
    
    Change-Id: I8a6d62a611879aaa6f6b823ecb11618c26e4123c

diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index f62e043..bd4db5c 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_Library_Library,uwinapi))
 
+$(eval $(call gb_Library_use_packages,uwinapi,\
+	sal_inc \
+	sal_odk_headers \
+))
+
 $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\
 	$(if $(filter $(COM),MSC), \
 		kernel32 \

More information about the Libreoffice-commits mailing list