[Libreoffice-commits] .: Branch 'feature/remote' - sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk

[Michael Meeks]

 sd/CppunitTest_sd_filters_test.mk |    4 ++++
 sd/CppunitTest_sd_uimpress.mk     |    6 +++++-
 sd/Library_sd.mk                  |    1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 271bb69df9de564b0585bda721869b878a546f1e
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Jul 9 16:33:00 2012 +0100

    make tests link
    
    Change-Id: I69d2baab2a6259e99188a86f916a6fa25d46ac74

diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 82512dc..a613b5c 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -67,6 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \
 	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_libs,sd_filters_test,\
+    $(shell pkg-config --libs glib-2.0 json-glib-1.0) \
+))
+
 $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\
     -I$(SRCDIR)/sd/source/ui/inc \
     -I$(SRCDIR)/sd/inc \
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 44fb871..4e45315 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -36,11 +36,15 @@ $(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
     -DSD_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_uimpress,\
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_uimpress,\
     offapi \
     udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_add_libs,sd_uimpress,\
+    $(shell pkg-config --libs glib-2.0 json-glib-1.0) \
+))
+
 $(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd))
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 98c083d..da17bcd 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_Library_add_libs,sd,\
     $(shell pkg-config --libs glib-2.0 json-glib-1.0) \
 ))
 
-
 $(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
 
 $(eval $(call gb_Library_add_exception_objects,sd,\