From dd8130b36118e19da045daf728651cd37f012faa Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:19:59 +0900 Subject: [PATCH] LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- buildtools/autotools/Makefile.am | 2 +- buildtools/lib/base/Makefile.am | 2 +- buildtools/lib/widgets/Makefile.am | 2 +- kdevdesigner/designer/Makefile.am | 2 +- kdevdesigner/plugins/Makefile.am | 2 +- kdevdesigner/src/Makefile.am | 2 +- languages/cpp/app_templates/kapp/src-Makefile.am | 4 ++-- languages/cpp/app_templates/kateplugin/src-Makefile.am | 2 +- languages/cpp/app_templates/kateplugin2/src-Makefile.am | 2 +- languages/cpp/app_templates/kdedcop/src-Makefile.am | 2 +- languages/cpp/app_templates/kdevlang/src-Makefile.am | 2 +- languages/cpp/app_templates/kdevpart/src-Makefile.am | 2 +- languages/cpp/app_templates/khello/src-Makefile.am | 2 +- languages/cpp/app_templates/khello2/src-Makefile.am | 2 +- languages/cpp/app_templates/kicker/src-Makefile.am | 2 +- languages/cpp/app_templates/kofficepart/src-Makefile.am | 6 +++--- languages/cpp/app_templates/konqnavpanel/src-Makefile.am | 2 +- languages/cpp/app_templates/kpartapp/src-Makefile.am | 4 ++-- languages/cpp/app_templates/kpartplugin/src-Makefile.am | 2 +- languages/cpp/app_templates/kxt/src-Makefile.am | 2 +- languages/cpp/app_templates/noatunui/src-Makefile.am | 2 +- languages/cpp/app_templates/noatunvisual/src-Makefile.am | 2 +- languages/cpp/app_templates/tdefileplugin/src-Makefile.am | 2 +- languages/cpp/app_templates/tdeioslave/src-Makefile.am | 2 +- languages/cpp/app_templates/tdescreensaver/src-Makefile.am | 4 ++-- languages/cpp/debugger/mi/Makefile.am | 2 +- languages/lib/debugger/Makefile.am | 2 +- languages/lib/designer_integration/Makefile.am | 2 +- languages/lib/interfaces/Makefile.am | 2 +- lib/catalog/Makefile.am | 2 +- lib/cppparser/Makefile.am | 2 +- lib/interfaces/external/Makefile.am | 2 +- lib/interfaces/extras/Makefile.am | 2 +- parts/documentation/interfaces/Makefile.am | 2 +- parts/documentation/tools/htdig/Makefile.am | 2 +- src/Makefile.am | 4 ++-- src/newui/Makefile.am | 2 +- src/profileengine/lib/Makefile.am | 2 +- src/tdeconf_update/Makefile.am | 4 ++-- 39 files changed, 46 insertions(+), 46 deletions(-) diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am index 98f3ad51..a64c88f9 100644 --- a/buildtools/autotools/Makefile.am +++ b/buildtools/autotools/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib -I$(top_srcdir)/buildtools/lib/base \ kde_module_LTLIBRARIES = libkdevautoproject.la -libkdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN) +libkdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN) libkdevautoproject_la_LIBADD = \ $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \ $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \ diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index 7e1083ef..02bac5fc 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ METASOURCES = AUTO lib_LTLIBRARIES = libkdevbuildbase.la libkdevbuildbase_la_LDFLAGS = $(all_libraries) -libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) +libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_TQT) $(LIB_TDEUI) libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index 6042ea06..f78d3037 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ lib_LTLIBRARIES = libkdevbuildtoolswidgets.la libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ - $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor + $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \ environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \ diff --git a/kdevdesigner/designer/Makefile.am b/kdevdesigner/designer/Makefile.am index 1857de19..e00a6de8 100644 --- a/kdevdesigner/designer/Makefile.am +++ b/kdevdesigner/designer/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkdevdesignerpart.la libkdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) libkdevdesignerpart_la_LIBADD = \ $(top_builddir)/kdevdesigner/uilib/libkdevqui.la $(top_builddir)/kdevdesigner/shared/libshared.la \ - $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltqassistantclient $(LIB_TDEFILE) $(LIB_TDEPARTS) + $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltqassistantclient $(LIB_TDEFILE) $(LIB_TDEPARTS) libkdevdesignerpart_la_SOURCES = kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp partrcdir = $(kde_datadir)/kdevdesignerpart partdesktopdir = $(kde_servicesdir) diff --git a/kdevdesigner/plugins/Makefile.am b/kdevdesigner/plugins/Makefile.am index defe80c4..538382f1 100644 --- a/kdevdesigner/plugins/Makefile.am +++ b/kdevdesigner/plugins/Makefile.am @@ -4,5 +4,5 @@ kdevdesignerdir = $(kde_moduledir)/plugins/kdevdesigner kdevdesigner_LTLIBRARIES = libkdevdesigner_lang.la libkdevdesigner_lang_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) libkdevdesigner_lang_la_SOURCES = languageinterfaceimpl.cpp -libkdevdesigner_lang_la_LIBADD = $(LIB_QT) +libkdevdesigner_lang_la_LIBADD = $(LIB_TQT) diff --git a/kdevdesigner/src/Makefile.am b/kdevdesigner/src/Makefile.am index e5e68a98..e4dc804c 100644 --- a/kdevdesigner/src/Makefile.am +++ b/kdevdesigner/src/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = kdevdesigner # the application source, library search path, and link libraries kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp -kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kdevdesigner_LDADD = $(LIB_TDEPARTS) # this is where the desktop file will go diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am index 8125665b..ee5e379b 100644 --- a/languages/cpp/app_templates/kapp/src-Makefile.am +++ b/languages/cpp/app_templates/kapp/src-Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_client INCLUDES = $(all_includes) # the library search path. -%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) +%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) # the libraries to link against. %{APPNAMELC}_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) @@ -21,7 +21,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h # client stuff -%{APPNAMELC}_client_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) +%{APPNAMELC}_client_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) %{APPNAMELC}_client_LDADD = $(LIB_TDECORE) %{APPNAMELC}_client_SOURCES = %{APPNAMELC}_client.cpp diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am index ef4450c1..91f3bc60 100644 --- a/languages/cpp/app_templates/kateplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp lib%{APPNAMELC}plugin_la_LIBADD = -lkateinterfaces -lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) pluginsdir = $(kde_datadir)/kate/plugins/%{APPNAMELC} plugins_DATA = plugin_%{APPNAMELC}.rc diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am index 1cc61110..409af4d6 100644 --- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp lib%{APPNAMELC}plugin_la_LIBADD = -lkateinterfaces -lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) pluginsdir = $(kde_datadir)/kate/plugins/%{APPNAMELC} plugins_DATA = plugin_%{APPNAMELC}.rc diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am index 19ddf2fb..380bdce4 100644 --- a/languages/cpp/app_templates/kdedcop/src-Makefile.am +++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am @@ -19,5 +19,5 @@ bin_PROGRAMS = %{APPNAMELC} # the application source, library search path, and link libraries %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}_iface.skel mainclass.cpp -%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) %{APPNAMELC}_LDADD = $(LIB_TDEUI) diff --git a/languages/cpp/app_templates/kdevlang/src-Makefile.am b/languages/cpp/app_templates/kdevlang/src-Makefile.am index 18b7a21a..20d51b48 100644 --- a/languages/cpp/app_templates/kdevlang/src-Makefile.am +++ b/languages/cpp/app_templates/kdevlang/src-Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes) kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la -libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp diff --git a/languages/cpp/app_templates/kdevpart/src-Makefile.am b/languages/cpp/app_templates/kdevpart/src-Makefile.am index 5fe18f43..93595138 100644 --- a/languages/cpp/app_templates/kdevpart/src-Makefile.am +++ b/languages/cpp/app_templates/kdevpart/src-Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la -libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \ diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am index 5eed38b6..279a58fd 100644 --- a/languages/cpp/app_templates/khello/src-Makefile.am +++ b/languages/cpp/app_templates/khello/src-Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = %{APPNAMELC} # the application source, library search path, and link libraries %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp -%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) %{APPNAMELC}_LDADD = $(LIB_TDEUI) # this is where the desktop file will go diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am index 453bfd55..fa431413 100644 --- a/languages/cpp/app_templates/khello2/src-Makefile.am +++ b/languages/cpp/app_templates/khello2/src-Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = %{APPNAMELC} # the application source, library search path, and link libraries %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}widgetbase.ui -%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) %{APPNAMELC}_LDADD = $(LIB_TDEUI) # this is where the desktop file will go diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am index 296282f5..54711447 100644 --- a/languages/cpp/app_templates/kicker/src-Makefile.am +++ b/languages/cpp/app_templates/kicker/src-Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la %{APPNAMELC}_panelapplet_la_SOURCES = %{APPNAMELC}.cpp -%{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +%{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) %{APPNAMELC}_panelapplet_la_LIBADD = $(LIB_TDEUI) %{APPNAMELC}_DATA = %{APPNAMELC}.desktop diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am index dbe77db5..6e355328 100644 --- a/languages/cpp/app_templates/kofficepart/src-Makefile.am +++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am @@ -5,19 +5,19 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp \ %{APPNAMELC}_view.cpp %{APPNAMELC}_factory.cpp -lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) lib%{APPNAMELC}part_la_LIBADD = -lkofficeui ## The tdeinit loadable module lib_LTLIBRARIES = %{APPNAMELC}.la %{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp -%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) %{APPNAMELC}_la_LIBADD = -lkofficecore ## The executable bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_SOURCES = dummy.cpp -%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) %{APPNAMELC}_LDADD = %{APPNAMELC}.la dummy.cpp: diff --git a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am index 18790bd3..938305b5 100644 --- a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am +++ b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES=konqsidebar_%{APPNAMELC}.la konqsidebar_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp -konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lkonqsidebarplugin +konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lkonqsidebarplugin konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) %{APPNAMELC}_entry_DATA = %{APPNAMELC}.desktop diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am index 3fe0f319..b0244dd1 100644 --- a/languages/cpp/app_templates/kpartapp/src-Makefile.am +++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = %{APPNAMELC} # the application source, library search path, and link libraries %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp -%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) +%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) %{APPNAMELC}_LDADD = $(LIB_TDEPARTS) # this is where the desktop file will go @@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la # the Part's source, library search path, and link libraries lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp -lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) +lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) lib%{APPNAMELC}part_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) # this is where the desktop file will go diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am index d74389bd..3409c920 100644 --- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la # using the TDEHTML Part lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp lib%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEHTML) -lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) # Install the .rc file in the Part's directory (in this case, the part # is TDEHTMLPart) diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am index 253c2517..d42188ed 100644 --- a/languages/cpp/app_templates/kxt/src-Makefile.am +++ b/languages/cpp/app_templates/kxt/src-Makefile.am @@ -11,7 +11,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # the library search path. -%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) # the libraries to link against. %{APPNAMELC}_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am index 6043abc5..1dd00b98 100644 --- a/languages/cpp/app_templates/noatunui/src-Makefile.am +++ b/languages/cpp/app_templates/noatunui/src-Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp -noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lnoatuncontrols \ -lqtmcop -lkmedia2_idl -lsoundserver_idl diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am index 023712e0..5a9c43f5 100644 --- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am +++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp -noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) noatun_%{APPNAMELC}plugin_la_CXXFLAGS = $(LIBSDL_CFLAGS) noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) $(LIBSDL_LIBS) -lnoatun -lm diff --git a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am index 31078c93..9e82afcd 100644 --- a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am +++ b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = tdefile_%{APPNAMELC}.h kde_module_LTLIBRARIES = tdefile_%{APPNAMELC}.la tdefile_%{APPNAMELC}_la_SOURCES = tdefile_%{APPNAMELC}.cpp -tdefile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) +tdefile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) tdefile_%{APPNAMELC}_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files ((moc)) diff --git a/languages/cpp/app_templates/tdeioslave/src-Makefile.am b/languages/cpp/app_templates/tdeioslave/src-Makefile.am index 90e6cdfc..2c2f79ca 100644 --- a/languages/cpp/app_templates/tdeioslave/src-Makefile.am +++ b/languages/cpp/app_templates/tdeioslave/src-Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdeio_%{APPNAMELC}.la tdeio_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp tdeio_%{APPNAMELC}_la_LIBADD = -ltdeio -tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) protocol_DATA = %{APPNAMELC}.protocol protocoldir = $(kde_servicesdir) diff --git a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am index b0cc8d33..1d419822 100644 --- a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am +++ b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am @@ -5,12 +5,12 @@ AM_CPPFLAGS = -UQT_NO_ASCII_CAST METASOURCES = AUTO INCLUDES = $(all_includes) -LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) LDADD = $(LIB_TDEUI) -ltdescreensaver -lm bin_PROGRAMS = %{APPNAMELC}.kss %{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp -%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LDADD) $(LIB_TDESYCOCA) +%{APPNAMELC}_kss_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LDADD) $(LIB_TDESYCOCA) #datadir = $(kde_datadir)/%{APPNAMELC} diff --git a/languages/cpp/debugger/mi/Makefile.am b/languages/cpp/debugger/mi/Makefile.am index d6cdf5f7..17531168 100644 --- a/languages/cpp/debugger/mi/Makefile.am +++ b/languages/cpp/debugger/mi/Makefile.am @@ -7,6 +7,6 @@ INCLUDES = $(all_includes) lib_LTLIBRARIES = libgdbmi_parser.la libgdbmi_parser_la_LDFLAGS = $(all_libraries) -libgdbmi_parser_la_LIBADD = $(LIB_QT) +libgdbmi_parser_la_LIBADD = $(LIB_TQT) libgdbmi_parser_la_SOURCES = gdbmi.cpp miparser.cpp milexer.cpp diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am index fc8923aa..1f71a090 100644 --- a/languages/lib/debugger/Makefile.am +++ b/languages/lib/debugger/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO lib_LTLIBRARIES = liblang_debugger.la liblang_debugger_la_LDFLAGS = $(all_libraries) -liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) -ltdetexteditor +liblang_debugger_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEPARTS) -ltdetexteditor liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp langincludedirdir = $(includedir)/tdevelop/languages/debugger langincludedir_HEADERS = debugger.h kdevdebugger.h diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am index 6e9680a9..759d0de1 100644 --- a/languages/lib/designer_integration/Makefile.am +++ b/languages/lib/designer_integration/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ METASOURCES = AUTO libdesignerintegration_la_LDFLAGS = $(all_libraries) lib_LTLIBRARIES = libdesignerintegration.la -libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \ implementationwidget.cpp qtdesignerintegration.cpp diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am index c3ed3d00..028b3327 100644 --- a/languages/lib/interfaces/Makefile.am +++ b/languages/lib/interfaces/Makefile.am @@ -4,7 +4,7 @@ langincludedirdir = $(includedir)/tdevelop/languages/interfaces lib_LTLIBRARIES = liblang_interfaces.la liblang_interfaces_la_LDFLAGS = $(all_libraries) liblang_interfaces_la_SOURCES = kdevpcsimporter.cpp -liblang_interfaces_la_LIBADD = $(LIB_QT) +liblang_interfaces_la_LIBADD = $(LIB_TQT) langincludedir_HEADERS = kdevpcsimporter.h INCLUDES = $(all_includes) servicetypedir = $(kde_servicetypesdir) diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am index c8c7ddc1..30b87455 100644 --- a/lib/catalog/Makefile.am +++ b/lib/catalog/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) $(DB3INCLUDES) lib_LTLIBRARIES = libkdevcatalog.la libkdevcatalog_la_SOURCES = tag.cpp catalog.cpp libkdevcatalog_la_LDFLAGS = -no-undefined $(all_libraries) $(DB3LDFLAGS) -libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT) +libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_TQT) kdevcatalogincludedir = $(includedir)/tdevelop/catalog kdevcataloginclude_HEADERS = catalog.h tag.h diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am index 4e62cebf..c0bbae1f 100644 --- a/lib/cppparser/Makefile.am +++ b/lib/cppparser/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) AM_CXXFLAGS = -DKDEVELOP_BGPARSER lib_LTLIBRARIES = libkdevcppparser.la libkdevcppparser_la_LDFLAGS = $(all_libraries) -libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript +libkdevcppparser_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \ lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp diff --git a/lib/interfaces/external/Makefile.am b/lib/interfaces/external/Makefile.am index 4cb7ee10..4a9e368c 100644 --- a/lib/interfaces/external/Makefile.am +++ b/lib/interfaces/external/Makefile.am @@ -6,7 +6,7 @@ kinterfacedesignerdir = $(includedir)/kinterfacedesigner kinterfacedesigner_HEADERS = designer.h lib_LTLIBRARIES = libkinterfacedesigner.la -libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDEUI) +libkinterfacedesigner_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDEUI) libkinterfacedesigner_la_LDFLAGS = $(all_libraries) libkinterfacedesigner_la_SOURCES = designer.cpp diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am index 67615223..0f01392c 100644 --- a/lib/interfaces/extras/Makefile.am +++ b/lib/interfaces/extras/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ $(all_includes) METASOURCES = AUTO -libkdevextras_la_LIBADD = $(LIB_QT) +libkdevextras_la_LIBADD = $(LIB_TQT) libkdevextras_la_LDFLAGS = $(all_libraries) lib_LTLIBRARIES = libkdevextras.la tdevelopincludedir = $(includedir)/tdevelop/interfaces/extras diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am index f128dabc..4c0ade5b 100644 --- a/parts/documentation/interfaces/Makefile.am +++ b/parts/documentation/interfaces/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO partincludedirdir = $(includedir)/tdevelop/parts/documentation lib_LTLIBRARIES = libdocumentation_interfaces.la libdocumentation_interfaces_la_LDFLAGS = $(all_libraries) -libdocumentation_interfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) +libdocumentation_interfaces_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) libdocumentation_interfaces_la_SOURCES = kdevdocumentationplugin.cpp partincludedir_HEADERS = kdevdocumentationplugin.h servicetypedir = $(kde_servicetypesdir) diff --git a/parts/documentation/tools/htdig/Makefile.am b/parts/documentation/tools/htdig/Makefile.am index 3ad05393..c161c57b 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 = tdevelop-htdig -tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdevelop_htdig_SOURCES = htdigindex.cpp noinst_HEADERS = htdigindex.h diff --git a/src/Makefile.am b/src/Makefile.am index 047e89a4..0e12d990 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ bin_PROGRAMS = tdevelop kdevassistant tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui tdevelop_METASOURCES = AUTO -tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner tdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner rcdir = $(kde_datadir)/tdevelop @@ -35,7 +35,7 @@ tdevelopdatadir = $(kde_confdir) tdevelopdata_DATA = tdeveloprc kdevassistantrc SUBDIRS = profiles profileengine newui tdeconf_update -kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner diff --git a/src/newui/Makefile.am b/src/newui/Makefile.am index d30e3610..031bf10c 100644 --- a/src/newui/Makefile.am +++ b/src/newui/Makefile.am @@ -11,4 +11,4 @@ libd_la_LDFLAGS = $(all_libraries) noinst_HEADERS = dmainwindow.h ddockwindow.h buttonbar.h button.h comdefs.h docksplitter.h dtabwidget.h libd_la_SOURCES = dmainwindow.cpp buttonbar.cpp \ button.cpp ddockwindow.cpp docksplitter.cpp dtabwidget.cpp -libd_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +libd_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) diff --git a/src/profileengine/lib/Makefile.am b/src/profileengine/lib/Makefile.am index 08b6e7ad..02d5c222 100644 --- a/src/profileengine/lib/Makefile.am +++ b/src/profileengine/lib/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/external_interfaces \ METASOURCES = AUTO lib_LTLIBRARIES = libprofileengine.la libprofileengine_la_LDFLAGS = $(all_libraries) -libprofileengine_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) +libprofileengine_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) libprofileengine_la_SOURCES = profileengine.cpp profile.cpp profileincludedir = $(includedir)/tdevelop/shell/profileengine diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am index f806baa2..c66c174e 100644 --- a/src/tdeconf_update/Makefile.am +++ b/src/tdeconf_update/Makefile.am @@ -11,8 +11,8 @@ tdeconf_PROGRAMS = kdev-gen-settings-tdeconf_update tdeconfdir = $(libdir)/tdeconf_update_bin kdev_gen_settings_tdeconf_update_SOURCES = kdev-gen-settings-tdeconf_update.cpp -kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kdev_gen_settings_tdeconf_update_LDADD = $(LIB_QT) +kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdev_gen_settings_tdeconf_update_LDADD = $(LIB_TQT) # vim: set noet: