diff options
33 files changed, 48 insertions, 48 deletions
diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am index dc4a52bf..266bba8d 100644 --- a/karbon/plugins/flattenpath/Makefile.am +++ b/karbon/plugins/flattenpath/Makefile.am @@ -6,7 +6,7 @@ karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN) +karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = flattenpathplugin.rc diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am index 24f40b60..440cae4b 100644 --- a/karbon/plugins/imagetool/Makefile.am +++ b/karbon/plugins/imagetool/Makefile.am @@ -8,7 +8,7 @@ karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN) +karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am index 5f695fd4..4ba5d720 100644 --- a/karbon/plugins/insertknots/Makefile.am +++ b/karbon/plugins/insertknots/Makefile.am @@ -6,7 +6,7 @@ karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) \ ../../libkarboncommon.la -karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN) +karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = insertknotsplugin.rc diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am index 9be298ec..d257e98e 100644 --- a/karbon/plugins/roundcorners/Makefile.am +++ b/karbon/plugins/roundcorners/Makefile.am @@ -6,7 +6,7 @@ karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) \ ../../libkarboncommon.la -karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN) +karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = roundcornersplugin.rc diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am index 939327ee..d703b2a4 100644 --- a/karbon/plugins/shadoweffect/Makefile.am +++ b/karbon/plugins/shadoweffect/Makefile.am @@ -6,7 +6,7 @@ karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN) +karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = shadoweffectplugin.rc diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am index 3aa3bc05..4bc18c77 100644 --- a/karbon/plugins/whirlpinch/Makefile.am +++ b/karbon/plugins/whirlpinch/Makefile.am @@ -7,7 +7,7 @@ karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) \ ../../libkarboncommon.la -karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN) +karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = whirlpinchplugin.rc diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am index 89d48733..7dcd76e5 100644 --- a/karbon/plugins/zoomtool/Makefile.am +++ b/karbon/plugins/zoomtool/Makefile.am @@ -8,7 +8,7 @@ karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter$(all_libraries) -module $(KDE_PLUGIN) +karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/kchart/Makefile.am b/kchart/Makefile.am index d05332b4..2708152a 100644 --- a/kchart/Makefile.am +++ b/kchart/Makefile.am @@ -35,19 +35,19 @@ libkchartcommon_la_SOURCES = kchart_part.cc \ libkchartcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \ $(LIB_KOFFICEUI) \ kdchart/libkdchart.la -libkchartcommon_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined +libkchartcommon_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined $(LIB_QT) ## The part kde_module_LTLIBRARIES = libkchartpart.la libkchartpart_la_SOURCES = kchart_factory_init.cc -libkchartpart_la_LDFLAGS = $(KDE_PLUGIN) +libkchartpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT) libkchartpart_la_LIBADD = libkchartcommon.la ## The kdeinit loadable module and executable kdeinit_LTLIBRARIES = kchart.la bin_PROGRAMS = kchart_la_SOURCES = main.cc -kchart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kchart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) kchart_la_LIBADD = $(LIB_KOFFICECORE) noinst_HEADERS = kchart_part.h \ diff --git a/kformula/Makefile.am b/kformula/Makefile.am index e291a340..7cf02924 100644 --- a/kformula/Makefile.am +++ b/kformula/Makefile.am @@ -6,14 +6,14 @@ kde_module_LTLIBRARIES = libkformulapart.la libkformulapart_la_SOURCES = kformula_doc.cc \ kformula_view.cc kformula_factory.cc kformulawidget.cc kfconfig.cc \ kformula_view_iface.skel kformula_view_iface.cc formulastring.cc fsparser.cc -libkformulapart_la_LDFLAGS = $(KDE_PLUGIN) +libkformulapart_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore libkformulapart_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KFORMULA) $(LIB_KOTEXT) libkformulapart_la_METASOURCES = AUTO ## The kdeinit loadable module kdeinit_LTLIBRARIES = kformula.la kformula_la_SOURCES = main.cc -kformula_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kformula_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) kformula_la_LIBADD = $(LIB_KOFFICECORE) bin_PROGRAMS = diff --git a/kivio/plugins/kivioconnectortool/Makefile.am b/kivio/plugins/kivioconnectortool/Makefile.am index 10f0edd0..7858309a 100644 --- a/kivio/plugins/kivioconnectortool/Makefile.am +++ b/kivio/plugins/kivioconnectortool/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = \ kivio_connector_cursor2.xpm\ kivio_connector_cursor1.xpm -libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kivioconnectortool.rc diff --git a/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am b/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am index 47d68538..9b43ea82 100644 --- a/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am +++ b/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am @@ -3,7 +3,7 @@ stencil_DATA = straight_connector.xpm kde_module_LTLIBRARIES =straight_connector.la -straight_connector_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +straight_connector_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio # Hack to make it work (dave m) straight_connector_la_LIBADD = $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la diff --git a/kivio/plugins/kivioselecttool/Makefile.am b/kivio/plugins/kivioselecttool/Makefile.am index a664c979..3325e883 100644 --- a/kivio/plugins/kivioselecttool/Makefile.am +++ b/kivio/plugins/kivioselecttool/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ tool_select.cpp\ tool_select.h\ kivioselecttool.rc -libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui libkivioselecttool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kivioselecttool.rc diff --git a/kivio/plugins/kiviotargettool/Makefile.am b/kivio/plugins/kiviotargettool/Makefile.am index 34f2b72a..e22ac5cd 100644 --- a/kivio/plugins/kiviotargettool/Makefile.am +++ b/kivio/plugins/kiviotargettool/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \ METASOURCES = AUTO kde_module_LTLIBRARIES = libkiviotargettool.la -libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui libkiviotargettool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp diff --git a/kivio/plugins/kiviotexttool/Makefile.am b/kivio/plugins/kiviotexttool/Makefile.am index fa355929..6f3ba630 100644 --- a/kivio/plugins/kiviotexttool/Makefile.am +++ b/kivio/plugins/kiviotexttool/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST = \ kivio_text_cursor.xpm\ Text.sml\ Text.xpm -libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kiviotexttool.rc diff --git a/kivio/plugins/kiviozoomtool/Makefile.am b/kivio/plugins/kiviozoomtool/Makefile.am index 8343f4d4..ef74cfb2 100644 --- a/kivio/plugins/kiviozoomtool/Makefile.am +++ b/kivio/plugins/kiviozoomtool/Makefile.am @@ -18,7 +18,7 @@ EXTRA_DIST = \ kiviozoomtool.rc\ tool_zoom.cpp\ tool_zoom.h -libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui libkiviozoomtool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kiviozoomtool.rc diff --git a/kounavail/Makefile.am b/kounavail/Makefile.am index 3db20e67..84d816f5 100644 --- a/kounavail/Makefile.am +++ b/kounavail/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) ## The part kde_module_LTLIBRARIES = libkounavailpart.la libkounavailpart_la_SOURCES = kounavail.cc -libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) +libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts libkounavailpart_la_LIBADD = $(LIB_KOFFICECORE) METASOURCES = AUTO diff --git a/kplato/Makefile.am b/kplato/Makefile.am index eacfc3f0..fbe328a6 100644 --- a/kplato/Makefile.am +++ b/kplato/Makefile.am @@ -102,7 +102,7 @@ noinst_HEADERS = \ ## The part lib_LTLIBRARIES = kde_module_LTLIBRARIES = libkplatopart.la -libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) +libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint libkplatopart_la_LIBADD = $(LIB_KABC) $(LIB_KOFFICEUI) \ $(top_builddir)/kdgantt/libkdgantt.la ## $(top_builddir)/kugar/lib/libkugarlib.la @@ -113,7 +113,7 @@ libkplatopart_la_METASOURCES = AUTO kdeinit_LTLIBRARIES = kplato.la bin_PROGRAMS = kplato_la_SOURCES = main.cc -kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint kplato_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kplato.desktop diff --git a/kpresenter/Makefile.am b/kpresenter/Makefile.am index 7af7d3da..e954702b 100644 --- a/kpresenter/Makefile.am +++ b/kpresenter/Makefile.am @@ -68,7 +68,7 @@ libkpresenterprivate_la_SOURCES = KoPointArray.cpp KPrCanvas.cpp \ slidetransitionwidget.ui KPrSlideTransitionDia.cpp \ KPrPrinterDlg.cpp -libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined +libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts if include_ARTS ARTSKDE = -lartskde endif @@ -77,14 +77,14 @@ libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KO ## The part kde_module_LTLIBRARIES = libkpresenterpart.la libkpresenterpart_la_SOURCES = KPrFactoryInit.cpp -libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts libkpresenterpart_la_LIBADD = libkpresenterprivate.la ## The kdeinit loadable module and the executable kdeinit_LTLIBRARIES = kpresenter.la bin_PROGRAMS = kpresenter_la_SOURCES = main.cpp -kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts kpresenter_la_LIBADD = $(LIB_KOFFICECORE) METASOURCES = AUTO diff --git a/kspread/Makefile.am b/kspread/Makefile.am index 5a8eca9a..29d44045 100644 --- a/kspread/Makefile.am +++ b/kspread/Makefile.am @@ -28,12 +28,12 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \ kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \ kspread_generalProperty.cpp kspread_propertyEditor.cpp -libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined +libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \ dialogs/libdialogs.la tests/libtests.la \ $(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell -libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts libkspreadpart_la_LIBADD = libkspreadcommon.la libkspreadpart_la_SOURCES = kspread_factory_init.cc @@ -44,7 +44,7 @@ METASOURCES = AUTO kdeinit_LTLIBRARIES = kspread.la bin_PROGRAMS = kspread_la_SOURCES = main.cc -kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts kspread_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kspread.desktop diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am index 61f9561a..ee1573d5 100644 --- a/kspread/plugins/scripting/Makefile.am +++ b/kspread/plugins/scripting/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = scripting.h kspreadscripting_la_METASOURCES = AUTO -kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts kspreadscripting_la_LIBADD = $(top_builddir)/kspread/libkspreadcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la kde_services_DATA = kspreadscripting.desktop diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am index 1538610d..2e74c258 100644 --- a/kspread/plugins/scripting/kspreadcore/Makefile.am +++ b/kspread/plugins/scripting/kspreadcore/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = krosskspreadcore.la krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp -krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui krosskspreadcore_la_LIBADD = \ $(LIB_QT) \ $(LIB_KDECORE) \ diff --git a/kugar/kudesigner/Makefile.am b/kugar/kudesigner/Makefile.am index 24d4380e..281f8a2e 100644 --- a/kugar/kudesigner/Makefile.am +++ b/kugar/kudesigner/Makefile.am @@ -8,19 +8,19 @@ bin_PROGRAMS = lib_LTLIBRARIES = libkudesignercore.la libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \ kudesigner_doc.cpp -libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined +libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(LIB_KDEPRINT) ## The part kde_module_LTLIBRARIES = libkudesignerpart.la libkudesignerpart_la_SOURCES = kudesigner_part.cpp -libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) +libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) ## The kdeinit loadable module kdeinit_LTLIBRARIES = kudesigner.la kudesigner_la_SOURCES = main.cpp -kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version +kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts kudesigner_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kudesigner.desktop diff --git a/kword/Makefile.am b/kword/Makefile.am index 2fd145f6..bcf3caa4 100644 --- a/kword/Makefile.am +++ b/kword/Makefile.am @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la ## The part libkwordpart_la_SOURCES = KWFactoryInit.cpp -libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore libkwordpart_la_LIBADD = libkwordprivate.la ## A lib with all the code @@ -54,14 +54,14 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm KWLoadingInfo.cpp -libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined +libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore libkwordprivate_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la METASOURCES = AUTO ## The mailmerge interface library libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel -libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined +libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore libkwmailmerge_interface_la_LIBADD = $(LIB_QT) -lDCOP kwincludedir = $(includedir)/kword kwinclude_HEADERS = KWMailMergeDataSource.h @@ -73,7 +73,7 @@ kwmailmerge_servicetypedir=$(kde_servicetypesdir) kdeinit_LTLIBRARIES = kword.la bin_PROGRAMS = kword_la_SOURCES = main.cpp -kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore kword_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kword.desktop diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am index 8d596413..e1727009 100644 --- a/kword/mailmerge/Makefile.am +++ b/kword/mailmerge/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la ## Plugin encapsulating the (old) internally stored style kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp -kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore kwmailmerge_classic_la_LIBADD = ../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KOTEXT) METASOURCES = AUTO diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am index 9231a371..a32c8d3b 100644 --- a/kword/mailmerge/kabc/Makefile.am +++ b/kword/mailmerge/kabc/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwmailmerge_kabc.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_kabc_la_SOURCES = KWMailMergeKABC.cpp KWMailMergeKABCConfig.cpp addresspicker.ui -kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_kabc_la_LIBADD = ../../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KABC) METASOURCES = AUTO diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am index d69e9469..c1c80fab 100644 --- a/kword/mailmerge/kspread/Makefile.am +++ b/kword/mailmerge/kspread/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) \ kde_module_LTLIBRARIES = kwmailmerge_kspread.la kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp -kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_kspread_la_LIBADD = ../../libkwmailmerge_interface.la \ $(top_builddir)/kspread/libkspreadcommon.la $(LIB_KDEUI) diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am index 0c8595e0..2a5d4aeb 100644 --- a/kword/mailmerge/sql/Makefile.am +++ b/kword/mailmerge/sql/Makefile.am @@ -6,13 +6,13 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \ KWQtSqlEasyFilter.cpp -kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_qtsqldb_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h ## 2. Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel -kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_qtsqldb_power_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h diff --git a/plugins/scan/Makefile.am b/plugins/scan/Makefile.am index 9df2b9bd..f3e46938 100644 --- a/plugins/scan/Makefile.am +++ b/plugins/scan/Makefile.am @@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kofficescan.la kofficescan_la_SOURCES = scan.cpp noinst_HEADERS = scan.h -kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts kofficescan_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KOFFICECORE) kofficescan_la_METASOURCES = AUTO diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am index b24e4e14..d55350c0 100644 --- a/tools/kfile-plugins/abiword/Makefile.am +++ b/tools/kfile-plugins/abiword/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_abiword.h kde_module_LTLIBRARIES = kfile_abiword.la kfile_abiword_la_SOURCES = kfile_abiword.cpp -kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_abiword_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am index 8f8f7af6..1f7c52bd 100644 --- a/tools/kfile-plugins/gnumeric/Makefile.am +++ b/tools/kfile-plugins/gnumeric/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_gnumeric.h kde_module_LTLIBRARIES = kfile_gnumeric.la kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp -kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_gnumeric_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am index ab34443c..68d28884 100644 --- a/tools/kfile-plugins/koffice/Makefile.am +++ b/tools/kfile-plugins/koffice/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_koffice.h kde_module_LTLIBRARIES = kfile_koffice.la kfile_koffice_la_SOURCES = kfile_koffice.cpp -kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_koffice_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am index 0dbd2f75..47be5cd0 100644 --- a/tools/kfile-plugins/ooo/Makefile.am +++ b/tools/kfile-plugins/ooo/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_ooo.h kde_module_LTLIBRARIES = kfile_ooo.la kfile_ooo_la_SOURCES = kfile_ooo.cpp -kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_ooo_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/thumbnail/Makefile.am b/tools/thumbnail/Makefile.am index e4a0ff39..f9f08ac6 100644 --- a/tools/thumbnail/Makefile.am +++ b/tools/thumbnail/Makefile.am @@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la clipartthumbnail_la_SOURCES = clipartcreator.cpp clipartthumbnail_la_LIBADD = $(LIB_KOFFICECORE) # for KoClipartCollection -clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore kofficethumbnail_la_SOURCES = kofficecreator.cpp kofficethumbnail_la_LIBADD = $(LIB_KOFFICECORE) -kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore # otherofficethumbnail.desktop is currently not installed, as it gives too many problems kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop |