diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-26 14:52:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-26 14:53:55 +0200 |
| commit | 6b21eca3f0054dca6d2849c5915e9bdb1f63d2b9 (patch) | |
| tree | 559f11e7e36e2eec454d62ba71d489728540846c /sfx2 | |
| parent | de0b43dcdbf31d3a0376c25a3aa31aefb7217b72 (diff) | |
use gtk external in qstart
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/Library_qstart.mk | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 13842f774627..8819829fff21 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 \ |