From 8e0ab6882143a1aa5f9034819d1cf6155bd38278 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 26 Mar 2010 08:24:49 +0000 Subject: [PATCH] Automake fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1107610 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kfilereplace/Makefile.am | 4 ++-- kimagemapeditor/Makefile.am | 4 ++-- kommander/part/Makefile.am | 2 +- kxsldbg/kxsldbgpart/Makefile.am | 4 ++-- quanta/components/debugger/dbgp/Makefile.am | 2 +- quanta/components/debugger/gubed/Makefile.am | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kfilereplace/Makefile.am b/kfilereplace/Makefile.am index 528a791e..461e5d8d 100644 --- a/kfilereplace/Makefile.am +++ b/kfilereplace/Makefile.am @@ -21,7 +21,7 @@ libkfilereplacepart_la_SOURCES = kfilereplacepart.cpp kfilereplaceview.cpp \ knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp \ commandengine.cpp configurationclasses.cpp -libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP libkfilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) messages: rc.cpp @@ -38,6 +38,6 @@ partrc_DATA = kfilereplacepartui.rc shellrcdir = $(kde_datadir)/kfilereplace shellrc_DATA = kfilereplaceui.rc bin_PROGRAMS = kfilereplace -kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP kfilereplace_LDADD = $(LIB_KPARTS) kfilereplace_SOURCES = kfilereplace.cpp main.cpp diff --git a/kimagemapeditor/Makefile.am b/kimagemapeditor/Makefile.am index 3f2ed486..70b22fd6 100644 --- a/kimagemapeditor/Makefile.am +++ b/kimagemapeditor/Makefile.am @@ -38,10 +38,10 @@ noinst_HEADERS = \ kimeshell.h -libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) -kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) # set the include path for X, qt and KDE diff --git a/kommander/part/Makefile.am b/kommander/part/Makefile.am index 9ba32668..7e65e9bc 100644 --- a/kommander/part/Makefile.am +++ b/kommander/part/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/kommander/executor -I$(top_srcdir)/kommander/factory $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = libkommander_part.la -libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) kde_services_DATA = kommander_part.desktop libkommander_part_la_SOURCES = kommander_part.cpp diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am index ee5e1e9a..8ca96809 100644 --- a/kxsldbg/kxsldbgpart/Makefile.am +++ b/kxsldbg/kxsldbgpart/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libkxsldbgcommon.la libkxsldbgcommon_la_SOURCES = xsldbgwalkspeedimpl.cpp xsldbgtemplatesimpl.cpp xsldbgtemplatelistitem.cpp xsldbgsourcesimpl.cpp xsldbgoutputview.cpp xsldbglocalvariablesimpl.cpp xsldbglocallistitem.cpp xsldbglistitem.cpp xsldbginspector.cpp xsldbgglobalvariablesimpl.cpp xsldbggloballistitem.cpp xsldbgentitiesimpl.cpp xsldbgdoc.cpp xsldbgdialogbase.cpp xsldbgdebugger.cpp xsldbgconfigimpl.cpp xsldbgcallstackimpl.cpp xsldbgbreakpointsimpl.cpp xsldbgbreakpointlistitem.cpp qxsldbgdoc.cpp kxsldbg_part.cpp kxsldbg_partif.skel xsldbgwalkspeed.ui xsldbgtemplates.ui xsldbgsources.ui xsldbgmsgdialog.ui xsldbglocalvariables.ui xsldbgglobalvariables.ui xsldbgentities.ui xsldbgconfig.ui xsldbgcallstack.ui xsldbgbreakpoints.ui libkxsldbgcommon_la_METASOURCES = AUTO -libkxsldbgcommon_la_LDFLAGS = $(all_libraries) +libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP libkxsldbgcommon_la_LIBADD = libxsldbg/libxsldbg.la libqtnotfier/libqtnotfier.la noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbreakpointsimpl.h xsldbgcallstackimpl.h xsldbgconfigimpl.h xsldbgdebugger.h xsldbgdialogbase.h xsldbgdoc.h xsldbgdocmap.h xsldbgentitiesimpl.h xsldbggloballistitem.h xsldbgglobalvariablesimpl.h xsldbginspector.h xsldbglistitem.h xsldbglocallistitem.h xsldbglocalvariablesimpl.h xsldbgmsgdialogimpl.h xsldbgoutputview.h xsldbgsourcesimpl.h xsldbgtemplatelistitem.h xsldbgtemplatesimpl.h xsldbgwalkspeedimpl.h @@ -15,7 +15,7 @@ SUBDIRS = libqtnotfier libxsldbg INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes) -libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS) +libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_KPARTS) diff --git a/quanta/components/debugger/dbgp/Makefile.am b/quanta/components/debugger/dbgp/Makefile.am index fbff3bdf..0e74d5ad 100644 --- a/quanta/components/debugger/dbgp/Makefile.am +++ b/quanta/components/debugger/dbgp/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = quantadebuggerdbgp.la quantadebuggerdbgp_la_SOURCES = quantadebuggerdbgp.cpp dbgpsettingss.ui \ dbgpsettings.cpp dbgpnetwork.cpp qbytearrayfifo.cpp -quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP -lktexteditor quantadebuggerdbgp_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggerdbgp.desktop diff --git a/quanta/components/debugger/gubed/Makefile.am b/quanta/components/debugger/gubed/Makefile.am index 755a7409..01708be7 100644 --- a/quanta/components/debugger/gubed/Makefile.am +++ b/quanta/components/debugger/gubed/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = quantadebuggergubed.la quantadebuggergubed_la_SOURCES = gubedsettingss.ui quantadebuggergubed.cpp gubedsettings.cpp -quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP -lktexteditor quantadebuggergubed_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS) kde_services_DATA = quantadebuggergubed.desktop