summaryrefslogtreecommitdiffstats
path: root/kinit/Makefile.am
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-27 19:26:26 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-27 19:26:26 +0000
commit2fa036d5898ffd3dee5f4c396b09c7d904c49b5e (patch)
tree61105eaaae5fb7bc23dd0f4e51e5a28fb722603a /kinit/Makefile.am
parentda24d1f16d7461aec72b5a8f3a797acf73d7e6fd (diff)
downloadtdelibs-2fa036d5898ffd3dee5f4c396b09c7d904c49b5e.tar.gz
tdelibs-2fa036d5898ffd3dee5f4c396b09c7d904c49b5e.zip
Aviod conflicts with Qt4 namespace members
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1217530 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kinit/Makefile.am')
-rw-r--r--kinit/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/kinit/Makefile.am b/kinit/Makefile.am
index 4328af871..1f887538a 100644
--- a/kinit/Makefile.am
+++ b/kinit/Makefile.am
@@ -33,7 +33,7 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
kdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
-kdeinit_LDADD = $(LIB_KPARTS)
+kdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT)
kioslave_SOURCES = kioslave.cpp
kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
@@ -60,7 +60,7 @@ klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/l
klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
kstartupconfig_SOURCES = kstartupconfig.cpp
-kstartupconfig_LDADD = $(top_builddir)/kdecore/libkdefakes.la
+kstartupconfig_LDADD = $(top_builddir)/kdecore/libkdefakes.la $(LIB_QT)
kdostartupconfig_SOURCES = kdostartupconfig.cpp
kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)