[Libreoffice-commits] .: sfx2/Library_qstart.mk

[Bjoern Michaelsen]

 sfx2/Library_qstart.mk |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 24e5e18ccd413797f143b27945a226597a1c42b1
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jul 26 14:52:45 2011 +0200

    use gtk external in qstart

diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 13842f7..8819829 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\
     -I$(SRCDIR)/sfx2/inc/sfx2 \
     -I$(SRCDIR)/sfx2/inc/pch \
     -I$(OUTDIR)/inc \
-    $(filter -I%,$(GTK_CFLAGS)) \
 ))
 
 $(eval $(call gb_Library_add_api,qstart_gtk,\
@@ -53,14 +52,6 @@ $(eval $(call gb_Library_add_defs,qstart_gtk,\
 ))
 endif
 
-$(eval $(call gb_Library_add_cflags,qstart_gtk,\
-    $(filter-out -I%,$(GTK_CFLAGS)) \
-))
-
-$(eval $(call gb_Library_add_libs,qstart_gtk,\
-    $(GTK_LIBS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
     comphelper \
     cppu \
@@ -81,7 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
     sfx \
 ))
 
-$(eval $(call gb_Library_use_external,qstart_gtk,libxml2))
+$(eval $(call gb_Library_use_externals,qstart_gtk,\
+	gtk \
+	libxml2 \
+))
 
 $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
     sfx2/source/appl/shutdowniconunx \