From 36d7821740208b486c2a2e02ee29f5ced494e5c3 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 2 Jan 2010 22:25:48 +0000
Subject: Final automake fixes; compilation now succeeds under Ubuntu Karmic

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1069187 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdeui/Makefile.am              | 3 +--
 kdeui/kdetrayproxy/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'kdeui')

diff --git a/kdeui/Makefile.am b/kdeui/Makefile.am
index 70157796a..761c1db63 100644
--- a/kdeui/Makefile.am
+++ b/kdeui/Makefile.am
@@ -18,8 +18,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-SUBDIRS = . tests about
-DIST_SUBDIRS = kdetrayproxy
+SUBDIRS = . tests about kdetrayproxy
 
 INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/interfaces $(all_includes)
 
diff --git a/kdeui/kdetrayproxy/Makefile.am b/kdeui/kdetrayproxy/Makefile.am
index a1e803af0..01dc87082 100644
--- a/kdeui/kdetrayproxy/Makefile.am
+++ b/kdeui/kdetrayproxy/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_kdetrayproxy.la
 INCLUDES= -I$(top_srcdir)/kded $(all_includes)
 kded_kdetrayproxy_la_SOURCES = kdetrayproxy.cpp module.cpp module.skel
 kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
+kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 METASOURCES = AUTO
 
-- 
cgit v1.2.1