From 0f306b366147fc8a8556c603823327161bc98bdb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:45:45 -0600 Subject: Rename additional instances of KDE to TDE --- kcoloredit/Makefile.am | 8 ++++---- kdvi/Makefile.am | 2 +- kfax/Makefile.am | 4 ++-- kfaxview/Makefile.am | 2 +- kfaxview/libkfaximage/Makefile.am | 2 +- kfile-plugins/ps/Makefile.am | 2 +- kgamma/kcmkgamma/Makefile.am | 2 +- kghostview/Makefile.am | 2 +- kiconedit/Makefile.am | 2 +- kmrml/kmrml/Makefile.am | 2 +- kmrml/kmrml/kcontrol/Makefile.am | 2 +- kmrml/kmrml/lib/Makefile.am | 2 +- kmrml/kmrml/server/Makefile.am | 2 +- kolourpaint/Makefile.am | 4 ++-- kooka/Makefile.am | 2 +- kpdf/Makefile.am | 2 +- kpdf/shell/Makefile.am | 2 +- kpovmodeler/Makefile.am | 2 +- kruler/Makefile.am | 4 ++-- ksnapshot/Makefile.am | 4 ++-- ksvg/test/external/Makefile.am | 8 ++++---- kuickshow/src/Makefile.am | 2 +- kview/config/Makefile.am | 2 +- kview/kviewcanvas/Makefile.am | 2 +- kview/kviewcanvas/config/Makefile.am | 2 +- kview/kviewcanvas/test/Makefile.am | 2 +- kview/kviewviewer/Makefile.am | 2 +- kview/kviewviewer/test/Makefile.am | 2 +- kviewshell/Makefile.am | 2 +- 29 files changed, 39 insertions(+), 39 deletions(-) diff --git a/kcoloredit/Makefile.am b/kcoloredit/Makefile.am index 34992836..f45833e6 100644 --- a/kcoloredit/Makefile.am +++ b/kcoloredit/Makefile.am @@ -6,16 +6,16 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \ editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp \ kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp kcoloredit_METASOURCES = AUTO -kcoloredit_LDADD = $(LIB_KDEUI) $(LIB_KFILE) -kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_KFILE) +kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor rcdir = $(kde_datadir)/kcoloredit rc_DATA = kcoloreditui.rc bin_PROGRAMS = kcoloredit kcolorchooser kcolorchooser_SOURCES = kcolorchooser.cpp -kcolorchooser_LDADD = $(LIB_KDEUI) -kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcolorchooser_LDADD = $(LIB_TDEUI) +kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \ gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \ diff --git a/kdvi/Makefile.am b/kdvi/Makefile.am index a016ff12..98f5e94f 100644 --- a/kdvi/Makefile.am +++ b/kdvi/Makefile.am @@ -39,7 +39,7 @@ squeeze_SOURCES = squeeze.c KDE_OPTIONS = nofinal kdvi_SOURCES = main.cpp -kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts ## this option you can leave out. Just, if you use "make dist", you need it diff --git a/kfax/Makefile.am b/kfax/Makefile.am index f0c2f01d..c99a3d53 100644 --- a/kfax/Makefile.am +++ b/kfax/Makefile.am @@ -1,5 +1,5 @@ -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lm +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) -lm INCLUDES = $(all_includes) ####### Files diff --git a/kfaxview/Makefile.am b/kfaxview/Makefile.am index 259aaf6d..884c503a 100644 --- a/kfaxview/Makefile.am +++ b/kfaxview/Makefile.am @@ -12,7 +12,7 @@ METASOURCES = AUTO bin_PROGRAMS = kfaxview kfaxview_SOURCES = main.cpp -kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts # this is where the desktop file will go diff --git a/kfaxview/libkfaximage/Makefile.am b/kfaxview/libkfaximage/Makefile.am index 616afb3c..ae23fad4 100644 --- a/kfaxview/libkfaximage/Makefile.am +++ b/kfaxview/libkfaximage/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = libkfaximage.la libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version -libkfaximage_la_LIBADD = $(LIB_KDECORE) +libkfaximage_la_LIBADD = $(LIB_TDECORE) libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp include_HEADERS = kfaximage.h diff --git a/kfile-plugins/ps/Makefile.am b/kfile-plugins/ps/Makefile.am index b374ebc1..6d76e075 100644 --- a/kfile-plugins/ps/Makefile.am +++ b/kfile-plugins/ps/Makefile.am @@ -13,7 +13,7 @@ kfile_ps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kfile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la gsthumbnail_la_SOURCES = gscreator.cpp -gsthumbnail_la_LIBADD = $(LIB_KDECORE) ../../kghostview/libdscparse.la +gsthumbnail_la_LIBADD = $(LIB_TDECORE) ../../kghostview/libdscparse.la gsthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) # let automoc handle all of the meta source files (moc) diff --git a/kgamma/kcmkgamma/Makefile.am b/kgamma/kcmkgamma/Makefile.am index 6420ee92..43d05dd0 100644 --- a/kgamma/kcmkgamma/Makefile.am +++ b/kgamma/kcmkgamma/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_kgamma.la kcm_kgamma_la_METASOURCES=AUTO kcm_kgamma_la_SOURCES = xf86configpath.cpp xvidextwrap.cpp displaynumber.cpp \ gammactrl.cpp kgamma.cpp -kcm_kgamma_la_LIBADD = $(LIBVM) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +kcm_kgamma_la_LIBADD = $(LIBVM) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) kcm_kgamma_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) SUBDIRS = pics diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am index 81ebcfd1..5cf5cc67 100644 --- a/kghostview/Makefile.am +++ b/kghostview/Makefile.am @@ -28,7 +28,7 @@ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ libkghostviewpart_la_SOURCES = part_init.cpp kghostview_SOURCES = main.cpp -kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kghostview_LDADD = libkghostviewlib.la libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined diff --git a/kiconedit/Makefile.am b/kiconedit/Makefile.am index 96d32fd2..82783f2c 100644 --- a/kiconedit/Makefile.am +++ b/kiconedit/Makefile.am @@ -11,7 +11,7 @@ kiconedit_SOURCES = utils.cpp main.cpp kiconedit.cpp kicongrid.cpp \ kiconedit_METASOURCES = AUTO # the library search path. -kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kiconedit_LDADD = $(LIB_KFILE) -ltdeprint DISTCLEANFILES = *~ .deps/* .libs/* diff --git a/kmrml/kmrml/Makefile.am b/kmrml/kmrml/Makefile.am index bfedadd8..02eaf1e9 100644 --- a/kmrml/kmrml/Makefile.am +++ b/kmrml/kmrml/Makefile.am @@ -32,7 +32,7 @@ bin_PROGRAMS = lib_LTLIBRARIES = tdeinit_LTLIBRARIES = mrmlsearch.la -mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KDECORE) +mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDECORE) mrmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version mrmlsearch_la_SOURCES = mrmlsearch.cpp diff --git a/kmrml/kmrml/kcontrol/Makefile.am b/kmrml/kmrml/kcontrol/Makefile.am index c1330cfd..68a44912 100644 --- a/kmrml/kmrml/kcontrol/Makefile.am +++ b/kmrml/kmrml/kcontrol/Makefile.am @@ -15,7 +15,7 @@ xdg_apps_DATA = kcmkmrml.desktop #check_PROGRAMS = indextest #indextest_SOURCES = indextest.cpp indexer.cpp -#indextest_LDADD = $(LIB_KMRMLSTUFF) $(LIB_KDECORE) +#indextest_LDADD = $(LIB_KMRMLSTUFF) $(LIB_TDECORE) #indextest_LDFLAGS = $(all_libraries) diff --git a/kmrml/kmrml/lib/Makefile.am b/kmrml/kmrml/lib/Makefile.am index 4201f04f..1f6ec6ac 100644 --- a/kmrml/kmrml/lib/Makefile.am +++ b/kmrml/kmrml/lib/Makefile.am @@ -6,6 +6,6 @@ noinst_HEADERS = kmrml_config.h mrml_shared.h mrml_utils.h watcher_stub.h METASOURCES = AUTO libkmrmlstuff_la_LDFLAGS = $(all_libraries) -no-undefined -libkmrmlstuff_la_LIBADD = $(LIB_KDECORE) +libkmrmlstuff_la_LIBADD = $(LIB_TDECORE) INCLUDES = -I$(top_srcdir) $(all_includes) diff --git a/kmrml/kmrml/server/Makefile.am b/kmrml/kmrml/server/Makefile.am index 875684b0..4336a32a 100644 --- a/kmrml/kmrml/server/Makefile.am +++ b/kmrml/kmrml/server/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kded_daemonwatcher_la_SOURCES = watcher.cpp watcher.skel # watcher.stub kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) METASOURCES = AUTO diff --git a/kolourpaint/Makefile.am b/kolourpaint/Makefile.am index 681097e6..11d1ee45 100644 --- a/kolourpaint/Makefile.am +++ b/kolourpaint/Makefile.am @@ -39,8 +39,8 @@ kolourpaint_SOURCES = kolourpaint.cpp \ kpviewmanager.cpp \ kpviewscrollablecontainer.cpp \ kpwidgetmapper.cpp -kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kolourpaint_LDADD = $(LIB_KDEPRINT) \ +kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kolourpaint_LDADD = $(LIB_TDEPRINT) \ cursors/libkolourpaintcursors.la \ pixmapfx/libkolourpaintpixmapfx.la \ tools/libkolourpainttools.la \ diff --git a/kooka/Makefile.am b/kooka/Makefile.am index 4384fa76..dfb9622d 100644 --- a/kooka/Makefile.am +++ b/kooka/Makefile.am @@ -17,7 +17,7 @@ kooka_SOURCES = main.cpp kooka.cpp kookaview.cpp kookapref.cpp \ # pagesetup.cpp kooka_LDADD = $(LIB_KFILE) -ltdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL) -kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC) diff --git a/kpdf/Makefile.am b/kpdf/Makefile.am index fd5ccb49..b5d3739e 100644 --- a/kpdf/Makefile.am +++ b/kpdf/Makefile.am @@ -19,7 +19,7 @@ libkpdfpart_la_SOURCES = dcop.skel error.cpp part.cpp libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) libkpdfpart_la_LIBADD = xpdf/xpdf/libxpdf.la conf/libkpdfconf.la \ core/libkpdfcore.la ui/libkpdfui.la $(LIB_KPARTS) \ - $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) -lm + $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_KUTILS) -lm partdesktopdir = $(kde_servicesdir) partdesktop_DATA = kpdf_part.desktop diff --git a/kpdf/shell/Makefile.am b/kpdf/shell/Makefile.am index e3c55578..ed901f6e 100644 --- a/kpdf/shell/Makefile.am +++ b/kpdf/shell/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO bin_PROGRAMS = kpdf kpdf_SOURCES = main.cpp shell.cpp -kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpdf_LDADD = $(LIB_KPARTS) EXTRA_DIST = kpdf.desktop diff --git a/kpovmodeler/Makefile.am b/kpovmodeler/Makefile.am index 0125891a..44cd5295 100644 --- a/kpovmodeler/Makefile.am +++ b/kpovmodeler/Makefile.am @@ -227,7 +227,7 @@ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) bin_PROGRAMS = kpovmodeler kpovmodeler_SOURCES = main.cpp -kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpovmodeler_LDADD = libkpovmodeler.la dummy.cpp: diff --git a/kruler/Makefile.am b/kruler/Makefile.am index 8014ece0..bcdb32f0 100644 --- a/kruler/Makefile.am +++ b/kruler/Makefile.am @@ -4,8 +4,8 @@ INCLUDES= $(all_includes) bin_PROGRAMS = kruler kruler_METASOURCES = AUTO -kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kruler_LDADD = $(LIB_KDEUI) +kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kruler_LDADD = $(LIB_TDEUI) kruler_SOURCES = klineal.cpp main.cpp xdg_apps_DATA = kruler.desktop diff --git a/ksnapshot/Makefile.am b/ksnapshot/Makefile.am index a8676f30..cb687823 100644 --- a/ksnapshot/Makefile.am +++ b/ksnapshot/Makefile.am @@ -2,8 +2,8 @@ bin_PROGRAMS= ksnapshot INCLUDES = -DKSNAPVERSION="\"0.7\"" $(all_includes) -ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ksnapshot_LDADD = $(LIB_KDEPRINT) +ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksnapshot_LDADD = $(LIB_TDEPRINT) ksnapshot_SOURCES = ksnapshotiface.skel main.cpp ksnapshot.cpp \ regiongrabber.cpp windowgrabber.cpp ksnapshotwidget.ui diff --git a/ksvg/test/external/Makefile.am b/ksvg/test/external/Makefile.am index f6d57a64..bd6712ab 100644 --- a/ksvg/test/external/Makefile.am +++ b/ksvg/test/external/Makefile.am @@ -5,9 +5,9 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS) bin_PROGRAMS = svgdisplay printnodetest svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc -svgdisplay_LDADD = $(LIB_KDECORE) ../../libksvg.la -svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +svgdisplay_LDADD = $(LIB_TDECORE) ../../libksvg.la +svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor printnodetest_SOURCES = printnodetest.cpp -printnodetest_LDADD = $(LIB_KDECORE) ../../libksvg.la -printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +printnodetest_LDADD = $(LIB_TDECORE) ../../libksvg.la +printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kuickshow/src/Makefile.am b/kuickshow/src/Makefile.am index c541b30c..2cfb30cd 100644 --- a/kuickshow/src/Makefile.am +++ b/kuickshow/src/Makefile.am @@ -10,7 +10,7 @@ KDE_CXXFLAGS = $(IMLIB_CFLAGS) METASOURCES = AUTO kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version -kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) +kuickshow_la_LIBADD = $(LIB_TDEPRINT) $(LIB_IMLIB) kuickshow_la_SOURCES = kuickshow.cpp \ aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \ defaultswidget.cpp imagewindow.cpp kuickdata.cpp \ diff --git a/kview/config/Makefile.am b/kview/config/Makefile.am index 84f5aabd..5d09eee8 100644 --- a/kview/config/Makefile.am +++ b/kview/config/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kviewconfmodules.h kcm_kviewgeneralconfig_la_SOURCES = kviewconfmodules.cpp kcm_kviewgeneralconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kcm_kviewgeneralconfig_la_LIBADD = $(LIB_KDEUI) +kcm_kviewgeneralconfig_la_LIBADD = $(LIB_TDEUI) kcm_kviewgeneralconfig_DATA = kviewgeneralconfig.desktop kcm_kviewgeneralconfigdir = $(kde_servicesdir)/kconfiguredialog diff --git a/kview/kviewcanvas/Makefile.am b/kview/kviewcanvas/Makefile.am index 27e45d9f..8b6da0cc 100644 --- a/kview/kviewcanvas/Makefile.am +++ b/kview/kviewcanvas/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = kimageholder.h kimagecanvas.h libkviewcanvas_la_SOURCES = kimageholder.cpp kimagecanvas.cpp libkviewcanvas_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version -libkviewcanvas_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KUTILS) \ +libkviewcanvas_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEPRINT) $(LIB_KUTILS) \ $(top_builddir)/kview/kimageviewer/libkimageviewer.la METASOURCES = AUTO diff --git a/kview/kviewcanvas/config/Makefile.am b/kview/kviewcanvas/config/Makefile.am index b22a1ad5..25d77983 100644 --- a/kview/kviewcanvas/config/Makefile.am +++ b/kview/kviewcanvas/config/Makefile.am @@ -5,7 +5,7 @@ noinst_HEADERS = confmodules.h kcm_kviewcanvasconfig_la_SOURCES = generalconfigwidget.ui confmodules.cpp kcm_kviewcanvasconfig_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -kcm_kviewcanvasconfig_la_LIBADD = $(LIB_KDEUI) +kcm_kviewcanvasconfig_la_LIBADD = $(LIB_TDEUI) kcm_kviewcanvasconfig_DATA = kviewcanvasconfig.desktop kcm_kviewcanvasconfigdir = $(kde_servicesdir)/kconfiguredialog diff --git a/kview/kviewcanvas/test/Makefile.am b/kview/kviewcanvas/test/Makefile.am index c6a2b08c..d00efc03 100644 --- a/kview/kviewcanvas/test/Makefile.am +++ b/kview/kviewcanvas/test/Makefile.am @@ -5,5 +5,5 @@ METASOURCES = AUTO check_PROGRAMS = test test_SOURCES = main.cpp test.cpp -test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_LDADD = $(LIB_KPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la diff --git a/kview/kviewviewer/Makefile.am b/kview/kviewviewer/Makefile.am index 0aa490ec..363bac5c 100644 --- a/kview/kviewviewer/Makefile.am +++ b/kview/kviewviewer/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = kviewkonqextension.h kviewviewer.h libkviewviewer_la_SOURCES = printimagesettings.ui imagesettings.cpp kviewkonqextension.cpp kviewviewer.cpp libkviewviewer_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined -libkviewviewer_la_LIBADD = $(LIB_KDEPRINT) $(LIB_KUTILS) \ +libkviewviewer_la_LIBADD = $(LIB_TDEPRINT) $(LIB_KUTILS) \ $(top_builddir)/kview/kimageviewer/libkimageviewer.la METASOURCES = AUTO diff --git a/kview/kviewviewer/test/Makefile.am b/kview/kviewviewer/test/Makefile.am index d3e00137..65c3527f 100644 --- a/kview/kviewviewer/test/Makefile.am +++ b/kview/kviewviewer/test/Makefile.am @@ -5,5 +5,5 @@ METASOURCES = AUTO check_PROGRAMS = test test_SOURCES = main.cpp test.cpp -test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_LDADD = $(LIB_KPARTS) diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am index 8b8bcebd..5be569e4 100644 --- a/kviewshell/Makefile.am +++ b/kviewshell/Makefile.am @@ -39,7 +39,7 @@ emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la libkviewshell_la_SOURCES = kviewshell.cpp kviewshell_SOURCES = main.cpp -kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kviewshell_LDADD = libkviewshell.la ./libifaces.la -lkparts kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \ -- cgit v1.2.1