summaryrefslogtreecommitdiffstats
path: root/kdeui
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-02 22:25:48 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-02 22:25:48 +0000
commit36d7821740208b486c2a2e02ee29f5ced494e5c3 (patch)
treec8a42d8fc5aa7fb54bdf8819c789afbc2259ffeb /kdeui
parentd7b9791584eda0f022813fd2b2df50f59eba29c5 (diff)
downloadtdelibs-36d7821740208b486c2a2e02ee29f5ced494e5c3.tar.gz
tdelibs-36d7821740208b486c2a2e02ee29f5ced494e5c3.zip
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
Diffstat (limited to 'kdeui')
-rw-r--r--kdeui/Makefile.am3
-rw-r--r--kdeui/kdetrayproxy/Makefile.am2
2 files changed, 2 insertions, 3 deletions
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