[Libreoffice-commits] .: Branch 'feature/gbuild_shell' - shell/StaticLibrary_shlxthandler_common.mk shell/StaticLibrary_shlxthandler_common_x64.mk

David Tardon dtardon at kemper.freedesktop.org
Tue May 1 12:07:51 PDT 2012


 shell/StaticLibrary_shlxthandler_common.mk     |    4 ----
 shell/StaticLibrary_shlxthandler_common_x64.mk |    4 ----
 2 files changed, 8 deletions(-)

New commits:
commit 38027d9d66d1ec96d80aa2bf87ae77986d7ea723
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 1 21:02:34 2012 +0200

    there is no need to link with any other static lib
    
    Even if gb_StaticLibrary_add_libs was the right function for that, which
    it is not.
    
    Change-Id: Ib7eb1d2dbb10bfb06dc3f9b8910a94d6933626d7

diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index 186c1f9..057b809 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -52,10 +52,6 @@ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
 	zlib \
 ))
 
-$(eval $(call gb_StaticLibrary_add_libs,shlxthandler_common,\
-	shell_xmlparser \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common,\
     shell/source/win32/ooofilereader/autostyletag \
     shell/source/win32/ooofilereader/basereader \
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 634b977..b0d0124 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -54,10 +54,6 @@ $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
 	zlib \
 ))
 
-$(eval $(call gb_StaticLibrary_add_libs,shlxthandler_common,\
-	shell_xmlparser_x64 \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common_x64,\
     CustomTarget/shell/source/win32/ooofilereader/autostyletag \
     CustomTarget/shell/source/win32/ooofilereader/basereader \


More information about the Libreoffice-commits mailing list