diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-29 22:24:19 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:33:57 +0200 |
| commit | 30bcb7fb1706b405577417625ed3855485936d0b (patch) | |
| tree | a6d1053775095a76b6c5550ea732c18f02e9f447 | |
| parent | eb238735cf71cfe39218fa19ae1b2b1af9cd6ca8 (diff) | |
set all kde4 libs in configure
Change-Id: I44b089613710bbdc776a27720c1851f68de1671e
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | shell/Library_kde4be.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde4.mk | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/configure.in b/configure.in index dd8420565516..1c3af6ca76ee 100644 --- a/configure.in +++ b/configure.in @@ -9869,7 +9869,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure". fi KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" - KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui" + KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkio -lkfile -lkdeui -lkdecore -lQtCore -lQtGui" AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index a914119e7da9..4aa63bd4755a 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -43,11 +43,6 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\ $(gb_STDLIBS) \ )) -# FIXME: add this to kde or create a new external -$(eval $(call gb_Library_add_libs,kde4be1,\ - -lkio \ -)) - $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) $(eval $(call gb_Library_add_exception_objects,kde4be1,\ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 26033bd53c3f..256d2eecfdaa 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -44,10 +44,6 @@ $(eval $(call gb_Library_use_api,vclplug_kde4,\ udkapi \ )) -$(eval $(call gb_Library_add_libs,vclplug_kde4,\ - -lkio -lkfile \ -)) - $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ vclplug_gen \ vcl \ |