diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-27 03:58:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-27 03:58:34 +0000 |
| commit | 28da872b36ac166c3cef1decb94a3774197fc714 (patch) | |
| tree | 7d72877f8e51fe4c760ae46d9478cf5b4c5b2880 | |
| parent | 31e58d83a164671c4da692d718e9f38cc9715361 (diff) | |
| download | tdebase-28da872b36ac166c3cef1decb94a3774197fc714.tar.gz tdebase-28da872b36ac166c3cef1decb94a3774197fc714.zip | |
Second attempt to fix FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1180128 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kicker/kicker/Makefile.am | 5 | ||||
| -rw-r--r-- | kicker/kicker/buttons/Makefile.am | 5 | ||||
| -rw-r--r-- | kicker/kicker/kshowdesktop.cpp (renamed from kicker/kicker/buttons/kshowdesktop.cpp) | 12 |
3 files changed, 6 insertions, 16 deletions
diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index 9a89a0ac0..4c6b1a981 100644 --- a/kicker/kicker/Makefile.am +++ b/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 diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am index 49d5693a4..1ec3d42d6 100644 --- a/kicker/kicker/buttons/Makefile.am +++ b/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 diff --git a/kicker/kicker/buttons/kshowdesktop.cpp b/kicker/kicker/kshowdesktop.cpp index 4f9dcd2e2..af5958de4 100644 --- a/kicker/kicker/buttons/kshowdesktop.cpp +++ b/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() { |