From 4f55ea0fcee52e34a720ad5e6bc02d7a6ecb762d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:19:58 +0900 Subject: [PATCH] LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- kapptemplate/ChangeLog | 2 +- kbabel/catalogmanager/Makefile.am | 4 ++-- kbabel/kbabel/Makefile.am | 4 ++-- kbabel/kbabeldict/Makefile.am | 8 ++++---- kbugbuster/Makefile.am | 2 +- kmtrace/Makefile.am | 6 +++--- kompare/Makefile.am | 2 +- kompare/interfaces/Makefile.am | 2 +- kspy/Makefile.am | 2 +- kstartperf/Makefile.am | 4 ++-- kuiviewer/Makefile.am | 2 +- poxml/Makefile.am | 20 ++++++++++---------- tdecachegrind/tdecachegrind/Makefile.am | 2 +- tdeioslave/svn/svnhelper/Makefile.am | 2 +- tdeunittest/Makefile.am | 4 ++-- tdeunittest/example/simple/Makefile.am | 4 ++-- umbrello/umbrello/docgenerators/Makefile.am | 2 +- umbrello/uml.kdevprj | 2 +- 18 files changed, 37 insertions(+), 37 deletions(-) diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog index e3563d37..7126b01f 100644 --- a/kapptemplate/ChangeLog +++ b/kapptemplate/ChangeLog @@ -163,7 +163,7 @@ Nov-02-1999 - Kurt Granroth (v0.4) dcopclient.py for more info on that)! Jan-24-1999 - Kurt Granroth (v0.3.2) - o Added LIB_X11 and LIB_QT to acinclude.m4 + o Added LIB_X11 and LIB_TQT to acinclude.m4 Jan-18-1999 - Kurt Granroth (v0.3.1) o AUGH!! I forgot 'acinclude.m4'!! diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am index 900d8439..d9ccb32f 100644 --- a/kbabel/catalogmanager/Makefile.am +++ b/kbabel/catalogmanager/Makefile.am @@ -27,14 +27,14 @@ libcatalogmanager_la_SOURCES = catalogmanageriface.skel \ libcatalogmanager_la_LIBADD = ../commonui/libkbabelcommonui.la \ ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \ ./libsvn/libcatalogmanagersvn.la $(LIB_TDEIO) -libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) catalogmanager_SOURCES = main.cpp # the libraries to link against. catalogmanager_LDADD = libcatalogmanager.la -catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) # these are the headers for your project noinst_HEADERS = catalogmanageriface.h catalogmanager.h \ diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am index 90ec3ea6..2ae11463 100644 --- a/kbabel/kbabel/Makefile.am +++ b/kbabel/kbabel/Makefile.am @@ -38,14 +38,14 @@ libkbabel_la_SOURCES = kbbookmarkhandler.cpp \ kde_kcfg_DATA=kbabel.kcfg libkbabel_la_LIBADD = ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_TDEIO) $(LIB_TDESPELL) -libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) kbabel_SOURCES = main.cpp # the libraries to link against. kbabel_LDADD = libkbabel.la -kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) # these are the headers for your project noinst_HEADERS = kbabel.h kbabelview.h \ diff --git a/kbabel/kbabeldict/Makefile.am b/kbabel/kbabeldict/Makefile.am index 61bfd4ed..a55546d7 100644 --- a/kbabel/kbabeldict/Makefile.am +++ b/kbabel/kbabeldict/Makefile.am @@ -19,20 +19,20 @@ INCLUDES = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_i lib_LTLIBRARIES = libkbabeldictplugin.la libkbabeldictplugin_la_SOURCES = searchengine.cpp libkbabeldictplugin_la_LIBADD = $(LIB_TDECORE) -libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkbabeldict_la_SOURCES = kbabeldictbox.cpp \ kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \ aboutmoduledlg.cpp libkbabeldict_la_LIBADD = ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_TDEUI) -libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp # the libraries to link against. -kbabeldict_LDADD = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kbabeldict_LDADD = libkbabeldict.la $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # these are the headers for your project noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am index 4a8ebde9..3ff67e3a 100644 --- a/kbugbuster/Makefile.am +++ b/kbugbuster/Makefile.am @@ -12,7 +12,7 @@ bin_PROGRAMS = kbugbuster kbugbuster_SOURCES = main.cpp kbugbuster_LDADD = -ltdeutils gui/libkbbmainwindow.la \ backend/libkbbbackend.la $(LIB_TDEHTML) $(LIB_TDEIO) -ltdefx $(LIB_TDEUTILS) -kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) +kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) xdg_apps_DATA = kbugbuster.desktop diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am index 6d6c5ffd..99b8feb0 100644 --- a/kmtrace/Makefile.am +++ b/kmtrace/Makefile.am @@ -23,13 +23,13 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kmtrace demangle kmmatch kmtrace_SOURCES = kmtrace.cpp -kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kmtrace_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor demangle_SOURCES = demangle.cpp -demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +demangle_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kmmatch_SOURCES = match.cpp -kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kmmatch_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor bin_SCRIPTS = kminspector diff --git a/kompare/Makefile.am b/kompare/Makefile.am index d75c1121..762ad559 100644 --- a/kompare/Makefile.am +++ b/kompare/Makefile.am @@ -26,7 +26,7 @@ bin_PROGRAMS = kompare # the application source, library search path, and link libraries kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp -kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kompare_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kompare_LDADD = $(LIB_TDEPARTS) \ $(top_builddir)/kompare/interfaces/libkompareinterface.la \ $(top_builddir)/kompare/libdialogpages/libdialogpages.la \ diff --git a/kompare/interfaces/Makefile.am b/kompare/interfaces/Makefile.am index ab8f9b93..4e77e371 100644 --- a/kompare/interfaces/Makefile.am +++ b/kompare/interfaces/Makefile.am @@ -4,5 +4,5 @@ lib_LTLIBRARIES = libkompareinterface.la libkompareinterface_la_LDFLAGS = -no-undefined $(all_libraries) libkompareinterface_la_SOURCES = kompareinterface.cpp -libkompareinterface_la_LIBADD = $(LIB_QT) +libkompareinterface_la_LIBADD = $(LIB_TQT) diff --git a/kspy/Makefile.am b/kspy/Makefile.am index 07d8cdab..b1e6cff6 100644 --- a/kspy/Makefile.am +++ b/kspy/Makefile.am @@ -7,7 +7,7 @@ include_HEADERS = kspy.h noinst_HEADERS = spy.h navview.h propsview.h navviewitem.h receiversview.h classinfoview.h -libkspy_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET) +libkspy_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIBSOCKET) # set the include path for X, qt and KDE INCLUDES= $(all_includes) diff --git a/kstartperf/Makefile.am b/kstartperf/Makefile.am index 6228c9ad..f1b2834e 100644 --- a/kstartperf/Makefile.am +++ b/kstartperf/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = $(all_includes) lib_LTLIBRARIES = libkstartperf.la -libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ldl -version-info 1:0 -no-undefined +libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ldl -version-info 1:0 -no-undefined libkstartperf_la_SOURCES = libkstartperf.c bin_PROGRAMS = kstartperf -kstartperf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) +kstartperf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) kstartperf_LDADD = $(LIB_TDECORE) kstartperf_SOURCES = kstartperf.cpp diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am index 52dcb3a4..e041ca99 100644 --- a/kuiviewer/Makefile.am +++ b/kuiviewer/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer # the application source, library search path, and link libraries kuiviewer_SOURCES = main.cpp kuiviewer.cpp -kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kuiviewer_LDADD = $(LIB_TDEPARTS) xdg_apps_DATA =kuiviewer.desktop diff --git a/poxml/Makefile.am b/poxml/Makefile.am index a0b202c2..b1d41955 100644 --- a/poxml/Makefile.am +++ b/poxml/Makefile.am @@ -7,24 +7,24 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS) SUBDIRS = antlr split2po_SOURCES = split.cpp parser.cpp -split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -split2po_LDADD = $(LIB_QT) +split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +split2po_LDADD = $(LIB_TQT) xml2pot_SOURCES = xml2pot.cpp parser.cpp -xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -xml2pot_LDADD = $(LIB_QT) +xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +xml2pot_LDADD = $(LIB_TQT) po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp -po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT) +po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +po2xml_LDADD = antlr/src/libantlr.la $(LIB_TQT) swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp -swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -swappo_LDADD = antlr/src/libantlr.la $(LIB_QT) +swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +swappo_LDADD = antlr/src/libantlr.la $(LIB_TQT) transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp -transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -transxx_LDADD = antlr/src/libantlr.la $(LIB_QT) +transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +transxx_LDADD = antlr/src/libantlr.la $(LIB_TQT) parser: cd $(srcdir) && java antlr.Tool gettext.g diff --git a/tdecachegrind/tdecachegrind/Makefile.am b/tdecachegrind/tdecachegrind/Makefile.am index dd9266e9..7bfa1379 100644 --- a/tdecachegrind/tdecachegrind/Makefile.am +++ b/tdecachegrind/tdecachegrind/Makefile.am @@ -44,7 +44,7 @@ INCLUDES= $(all_includes) METASOURCES = AUTO # the library search path. -tdecachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdecachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rcdir = $(kde_datadir)/tdecachegrind rc_DATA = tdecachegrindui.rc diff --git a/tdeioslave/svn/svnhelper/Makefile.am b/tdeioslave/svn/svnhelper/Makefile.am index 068212b9..6afd6e5a 100644 --- a/tdeioslave/svn/svnhelper/Makefile.am +++ b/tdeioslave/svn/svnhelper/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries) tdeio_svn_helper_SOURCES = tdeio_svn_helper.cpp subversioncheckout.ui subversionswitch.ui subversionlog.ui subversiondiff.ui -tdeio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEIO) $(all_libraries) +tdeio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEIO) $(all_libraries) servicemenudir = \ $(kde_datadir)/konqueror/servicemenus diff --git a/tdeunittest/Makefile.am b/tdeunittest/Makefile.am index 28cfbcf6..cb9c033e 100644 --- a/tdeunittest/Makefile.am +++ b/tdeunittest/Makefile.am @@ -4,14 +4,14 @@ METASOURCES = AUTO lib_LTLIBRARIES = libtdeunittestgui.la libtdeunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel -libtdeunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest +libtdeunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest libtdeunittestgui_la_LIBADD = -ltdeunittest $(LIB_TDECORE) runnergui.lo : testerwidget.h bin_PROGRAMS = tdeunittestguimodrunner tdeunittestguimodrunner_SOURCES = guimodrunner.cpp -tdeunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest +tdeunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest tdeunittestguimodrunner_LDADD = libtdeunittestgui.la $(LIB_TDECORE) $(LIB_TDEIO) noinst_HEADERS = dcopinterface.h diff --git a/tdeunittest/example/simple/Makefile.am b/tdeunittest/example/simple/Makefile.am index 162741eb..04f3d0f7 100644 --- a/tdeunittest/example/simple/Makefile.am +++ b/tdeunittest/example/simple/Makefile.am @@ -4,11 +4,11 @@ METASOURCES = AUTO check_PROGRAMS = sampletests sampletestsgui sampletests_SOURCES = main.cpp sampletest.cpp -sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor sampletests_LDADD = -ltdeunittest sampletestsgui_SOURCES = maingui.cpp sampletest.cpp -sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Normally you would write -ltdeunittestgui here, but since the examples # are bundled with the library source code itself we don't want to # have you install the libraries before you can compile the examples. diff --git a/umbrello/umbrello/docgenerators/Makefile.am b/umbrello/umbrello/docgenerators/Makefile.am index bc657026..30cac792 100644 --- a/umbrello/umbrello/docgenerators/Makefile.am +++ b/umbrello/umbrello/docgenerators/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr METASOURCES = AUTO bin_PROGRAMS = umbodoc -AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor umbodoc_COMPILE_FIRST = version.h umbodoc_SOURCES = main.cpp umbodoc_LDADD = $(LIB_TDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS) diff --git a/umbrello/uml.kdevprj b/umbrello/uml.kdevprj index 6f584c8d..fec9f43e 100644 --- a/umbrello/uml.kdevprj +++ b/umbrello/uml.kdevprj @@ -4,7 +4,7 @@ bin_program=umbrello cflags= cppflags= cxxflags=\s-O0 -g3 -Wall -ldadd=-lfl $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +ldadd=-lfl $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) ldflags=\s -Iuml/classparser -Iuml/dialogs -Iuml/clipboard [General]