diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-13 06:07:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-13 06:07:02 +0000 |
| commit | b2f30ae4c8cb9f6fe08bb063c626d477dacfbf70 (patch) | |
| tree | 094a88c37d3f1ebd842044314c0b10c55b6bac87 | |
| parent | 470373d06e87afca8cb54bcbe3c95afcc8b60598 (diff) | |
| download | tdevelop-b2f30ae4.tar.gz tdevelop-b2f30ae4.zip | |
Fix kdevelop FTBFS under oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1258708 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | parts/documentation/tools/htdig/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/parts/documentation/tools/htdig/Makefile.am b/parts/documentation/tools/htdig/Makefile.am index 8f38a799..5eeffad6 100644 --- a/parts/documentation/tools/htdig/Makefile.am +++ b/parts/documentation/tools/htdig/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) METASOURCES = AUTO bin_PROGRAMS = kdevelop-htdig -kdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_KIO) $(LIB_KDEUI) +kdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kdevelop_htdig_SOURCES = htdigindex.cpp noinst_HEADERS = htdigindex.h diff --git a/src/Makefile.am b/src/Makefile.am index 900b711a..433f69e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,11 +7,11 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/interfaces \ KDE_OPTIONS=nofinal lib_LTLIBRARIES = libkdevshell.la -libkdevshell_la_LDFLAGS = $(all_libraries) +libkdevshell_la_LDFLAGS = $(all_libraries) -lkdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner libkdevshell_la_LIBADD = \ $(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libkdevelop.la \ $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \ - $(top_builddir)/src/newui/libd.la $(LIB_KHTML) -lktexteditor + $(top_builddir)/src/newui/libd.la $(LIB_KHTML) -lktexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \ editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \ mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \ @@ -24,8 +24,8 @@ bin_PROGRAMS = kdevelop kdevassistant kdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui kdevelop_METASOURCES = AUTO -kdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kdevelop_LDADD = libkdevshell.la +kdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lkdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner rcdir = $(kde_datadir)/kdevelop rc_DATA = kdevelopui.rc eventsrc @@ -35,9 +35,9 @@ kdevelopdatadir = $(kde_confdir) kdevelopdata_DATA = kdeveloprc kdevassistantrc SUBDIRS = profiles profileengine newui kconf_update -kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lkdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp -kdevassistant_LDADD = libkdevshell.la +kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner rc_assistantdir = $(kde_datadir)/kdevassistant rc_assistant_DATA = kdevassistantui.rc |