[Libreoffice-commits] .: 3 commits - shell/CustomTarget_x64.mk shell/StaticLibrary_shlxthandler_common_x64.mk shell/StaticLibrary_xmlparser_x64.mk

[David Tardon]

 shell/CustomTarget_x64.mk                      |    2 +-
 shell/StaticLibrary_shlxthandler_common_x64.mk |    4 ++++
 shell/StaticLibrary_xmlparser_x64.mk           |    5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit b7c6716b4bc0742af4206035495d161e7eb49424
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 18:53:03 2012 +0200

    remove useless argument
    
    Change-Id: I8d5cd9a3ee8a469d4b0154f4423a6c811e3ad369

diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk
index 5139482..332a8e2 100644
--- a/shell/CustomTarget_x64.mk
+++ b/shell/CustomTarget_x64.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_CustomTarget_CustomTarget,shell/source,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,shell/source))
 
 SHELL_SHLXTHANDLER_COMMON_FILES := \
 	win32/ooofilereader/autostyletag \
commit 9548c17e7446fca1c14a1044ad76d5149021756f
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 18:52:39 2012 +0200

    ensure source files are present before trying to use them
    
    Change-Id: I8c7608121872976e275d00236539940d797b64c4

diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 98b5831..95e9911 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,shlxthandler_common_x64))
 
 $(eval $(call gb_StaticLibrary_set_x64,shlxthandler_common_x64,YES))
 
+$(eval $(call gb_StaticLibrary_use_custom_headers,shlxthandler_common_x64,\
+	shell/source \
+))
+
 $(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\
 	-I$(SRCDIR)/shell/inc \
 	$$(INCLUDE) \
commit 061b196922b2ccb050755e72a915dc5fa3d96cf2
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 18:49:59 2012 +0200

    fix include path
    
    Change-Id: I2857d5831e04227b9ebe12e4689f7d7a25221685

diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk
index 126ef81..f833c94 100644
--- a/shell/StaticLibrary_xmlparser_x64.mk
+++ b/shell/StaticLibrary_xmlparser_x64.mk
@@ -29,6 +29,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser_x64))
 
 $(eval $(call gb_StaticLibrary_set_x64,shell_xmlparser_x64,YES))
 
+$(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\
+	-I$(SRCDIR)/shell/inc \
+	$$(INCLUDE) \
+))
+
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,shell_xmlparser_x64,\
     CustomTarget/shell/source/all/xml_parser \
 ))