[Libreoffice-commits] core.git: libreofficekit/Library_libreofficekit.mk libreofficekit/StaticLibrary_libreofficekit.mk

Matúš Kukan matus.kukan at collabora.com
Fri Jun 13 01:28:12 PDT 2014


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

New commits:
commit ab6394bd62f2c48ed5f80ac318ca148beb36fa88
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.
    
    Change-Id: Id8474fb28d40a2373e2b0c85439cb5a96c469c85

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 \
 ))


More information about the Libreoffice-commits mailing list