[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - libreofficekit/Library_libreofficekit.mk libreofficekit/Module_libreofficekit.mk libreofficekit/StaticLibrary_libreofficekit.mk

[Matúš Kukan]

 libreofficekit/Library_libreofficekit.mk       |   31 -------------------------
 libreofficekit/Module_libreofficekit.mk        |    2 -
 libreofficekit/StaticLibrary_libreofficekit.mk |   16 ++++++++++++
 3 files changed, 17 insertions(+), 32 deletions(-)

New commits:
commit 7c084ae9787451445b23df6dd92978616eaca8f7
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Fri Jun 13 10:25:30 2014 +0200

    Rename makefile to StaticLibrary_libreofficekit and clean up.
    
    It's static library since d324745fe95c7f0fad56f146e1e33f994a0d5de6.
    
    (cherry picked from commits ab6394bd62f2c48ed5f80ac318ca148beb36fa88
    and 9d1e6613c4cf40ef66d9775a8c362e63cf3736d0)
    
    Change-Id: I726af96d6d9158010d2c2121ab2b43a78ad69698

diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
index d78a9c3..1d65d45 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,libreofficekit))
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_targets,libreofficekit,\
-    Library_libreofficekit \
+    StaticLibrary_libreofficekit \
 ))
 endif
 
diff --git a/libreofficekit/Library_libreofficekit.mk b/libreofficekit/StaticLibrary_libreofficekit.mk
similarity index 62%
rename from libreofficekit/Library_libreofficekit.mk
rename to libreofficekit/StaticLibrary_libreofficekit.mk
index b0699ff..7a82670 100644
--- a/libreofficekit/Library_libreofficekit.mk
+++ b/libreofficekit/StaticLibrary_libreofficekit.mk
@@ -9,21 +9,6 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,libreofficekit))
 
-$(eval $(call gb_StaticLibrary_set_include,libreofficekit,\
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_libs,libreofficekit,\
-    $(if $(filter $(OS),LINUX), \
-        -ldl \
-        -lpthread \
-    ) \
-))
-
-$(eval $(call gb_StaticLibrary_use_libraries,libreofficekit,\
-    $(gb_UWINAPI) \
-))
-
 $(eval $(call gb_StaticLibrary_add_cobjects,libreofficekit,\
     libreofficekit/source/shim \
 ))