Second attempt to fix FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1180128 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

kicker/kicker/Makefile.am

@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
 # SUBDIRS = core interfaces ui buttons plugins .
 SUBDIRS = core interfaces ui buttons .
 
-bin_PROGRAMS =
+bin_PROGRAMS = kshowdesktop
 lib_LTLIBRARIES =
 kdeinit_LTLIBRARIES = kicker.la
 
@@ -15,6 +15,9 @@ kicker_la_LIBADD = core/libkicker_core.la  buttons/libkicker_buttons.la \
 kicker_la_SOURCES = dummy.cpp
 kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
+kshowdesktop_SOURCES = kshowdesktop.cpp
+kshowdesktop_LDFLAGS = $(all_libraries) $(kicker_la_LIBADD)
+
 autostart_DATA = panel.desktop
 autostartdir = $(datadir)/autostart
 

kicker/kicker/buttons/Makefile.am

@@ -1,7 +1,6 @@
 INCLUDES = -I$(srcdir)/../core -I$(srcdir)/../../libkicker -I../../libkicker \
 	-I../ui -I$(srcdir)/../ui -I$(top_srcdir)/libkonq $(all_includes) $(LIBBEAGLE_CFLAGS) $(GLIB_CFLAGS)
 
-bin_PROGRAMS = kshowdesktop
 noinst_LTLIBRARIES = libkicker_buttons.la
 
 libkicker_buttons_la_SOURCES = servicebutton.cpp bookmarksbutton.cpp \
@@ -14,10 +13,6 @@ libkicker_buttons_la_LDFLAGS = $(all_libraries)
 libkicker_buttons_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB)
 libkicker_buttons_la_METASOURCES = AUTO
 
-kshowdesktop_SOURCES = kshowdesktop.cpp
-kshowdesktop_LDFLAGS = $(all_libraries) -L../core/.libs -lkicker_core
-kshowdesktop_LDADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB)
-
 desktopmenu_DATA = bookmarks.desktop browser.desktop desktop.desktop \
                    exec.desktop kmenu.desktop windowlist.desktop
 desktopmenudir = $(kde_datadir)/kicker/builtins

kicker/kicker/kshowdesktop.cpp

@@ -21,17 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <tqtooltip.h>
-#include <tqdragobject.h>
+#include <tqobject.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
-#include <konq_operations.h>
-#include <kfileitem.h>
-
-#include "showdesktop.h"
-#include "kicker.h"
-#include "kickerSettings.h"
+#include "core/showdesktop.h"
 
 int main()
 {