| af63bdbe | 2018-09-17 09:19:59 | Michele Calgaro |
LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro <michele.calgaro@...> |
||
|
M kimagemapeditor/Makefile.am M klinkstatus/src/Makefile.am M kommander/editor/Makefile.am M kommander/executor/Makefile.am M kommander/part/Makefile.am M kommander/plugin/Makefile.am M kommander/pluginmanager/Makefile.am M kommander/widget/Makefile.am M kommander/widgets/Makefile.am M kxsldbg/Makefile.am M kxsldbg/kxsldbgpart/Makefile.am M quanta/components/debugger/dbgp/Makefile.am M quanta/components/debugger/gubed/Makefile.am M quanta/src/Makefile.am |
||
kimagemapeditor/Makefile.amdiff --git a/kimagemapeditor/Makefile.am b/kimagemapeditor/Makefile.am index c75b267..bde46f0 100644 --- a/kimagemapeditor/Makefile.am +++ b/kimagemapeditor/Makefile.am @@ -38,10 +38,10 @@ kimeshell.h -libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP +libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEHTML) -kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP +kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEHTML) # set the include path for X, qt and KDE klinkstatus/src/Makefile.amdiff --git a/klinkstatus/src/Makefile.am b/klinkstatus/src/Makefile.am index b39f133..40542c9 100644 --- a/klinkstatus/src/Makefile.am +++ b/klinkstatus/src/Makefile.am @@ -17,7 +17,7 @@ # the application source, library search path, and link libraries -klinkstatus_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP +klinkstatus_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP klinkstatus_LDADD = $(LIB_TDEPARTS) xdg_apps_DATA = klinkstatus.desktop @@ -34,7 +34,7 @@ # the Part's source, library search path, and link libraries -libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP +libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la \ ui/libui.la engine/libengine.la \ parser/libparser.la utils/libutils.la $(LIB_TDEPARTS) $(LIB_TDEFILE) kommander/editor/Makefile.amdiff --git a/kommander/editor/Makefile.am b/kommander/editor/Makefile.am index 51fb4fb..dbb5758 100644 --- a/kommander/editor/Makefile.am +++ b/kommander/editor/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes) # the library search path. -kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) # the libraries to link against. kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \ kommander/executor/Makefile.amdiff --git a/kommander/executor/Makefile.am b/kommander/executor/Makefile.am index 4d7d22c..f5a3d62 100644 --- a/kommander/executor/Makefile.am +++ b/kommander/executor/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libinstance.la libinstance_la_SOURCES = instance.cpp dcopkommanderif.skel -libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kmdr_executor_SOURCES = main.cpp @@ -20,6 +20,6 @@ METASOURCES = AUTO # the library search path. -kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor noinst_HEADERS = dcopkommanderif.h kommander/part/Makefile.amdiff --git a/kommander/part/Makefile.am b/kommander/part/Makefile.am index fc89d75..9b1ca0b 100644 --- a/kommander/part/Makefile.am +++ b/kommander/part/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/kommander/executor -I$(top_srcdir)/kommander/factory $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = libkommander_part.la -libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin +libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEHTML) kde_services_DATA = kommander_part.desktop libkommander_part_la_SOURCES = kommander_part.cpp kommander/plugin/Makefile.amdiff --git a/kommander/plugin/Makefile.am b/kommander/plugin/Makefile.am index be5cd4e..3d48e7a 100644 --- a/kommander/plugin/Makefile.am +++ b/kommander/plugin/Makefile.am @@ -7,7 +7,7 @@ libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined # the libraries to link against. -libkommanderplugin_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +libkommanderplugin_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) libkommanderplugin_la_SOURCES = kommanderplugin.cpp specialinformation.cpp kommander/pluginmanager/Makefile.amdiff --git a/kommander/pluginmanager/Makefile.am b/kommander/pluginmanager/Makefile.am index c710321..c1abcfb 100644 --- a/kommander/pluginmanager/Makefile.am +++ b/kommander/pluginmanager/Makefile.am @@ -13,6 +13,6 @@ METASOURCES = AUTO # the library search path. -kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor noinst_HEADERS = mainwindow.h pluginmanager.h kommander/widget/Makefile.amdiff --git a/kommander/widget/Makefile.am b/kommander/widget/Makefile.am index 59fb131..ac37995 100644 --- a/kommander/widget/Makefile.am +++ b/kommander/widget/Makefile.am @@ -7,7 +7,7 @@ libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined # the libraries to link against. -libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_QT) -lDCOP +libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TQT) -lDCOP libkommanderwidget_la_SOURCES = expression.cpp function.cpp functionlib.cpp \ invokeclass.cpp kmdrmainwindow.cpp kommanderfunctions.cpp kommanderwidget.cpp \ kommander/widgets/Makefile.amdiff --git a/kommander/widgets/Makefile.am b/kommander/widgets/Makefile.am index dc42a32..aae6fbb 100644 --- a/kommander/widgets/Makefile.am +++ b/kommander/widgets/Makefile.am @@ -4,11 +4,11 @@ INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes) # the library search path. -#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined # the libraries to link against. -libkommanderwidgets_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) \ +libkommanderwidgets_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) \ $(top_builddir)/kommander/widget/libkommanderwidget.la \ $(top_builddir)/kommander/plugin/libkommanderplugin.la \ $(top_builddir)/kommander/factory/libkommanderfactory.la kxsldbg/Makefile.amdiff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am index 2be4986..13d428b 100644 --- a/kxsldbg/Makefile.am +++ b/kxsldbg/Makefile.am @@ -26,7 +26,7 @@ xsldbg_LDADD = kxsldbgpart/libxsldbg/libxsldbg.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_TDEUI) # # the library search path. -xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # These paths are KDE specific. Use them: # kde_appsdir Where your application's menu entry (.desktop) should go to. @@ -56,7 +56,7 @@ METASOURCES = AUTO # the application source, library search path, and link libraries -kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # this is where the shell's XML-GUI resource file goes shellrcdir = $(kde_datadir)/kxsldbg kxsldbg/kxsldbgpart/Makefile.amdiff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am index b38d50f..cdb5717 100644 --- a/kxsldbg/kxsldbgpart/Makefile.am +++ b/kxsldbg/kxsldbgpart/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libkxsldbgcommon.la libkxsldbgcommon_la_SOURCES = xsldbgwalkspeedimpl.cpp xsldbgtemplatesimpl.cpp xsldbgtemplatelistitem.cpp xsldbgsourcesimpl.cpp xsldbgoutputview.cpp xsldbglocalvariablesimpl.cpp xsldbglocallistitem.cpp xsldbglistitem.cpp xsldbginspector.cpp xsldbgglobalvariablesimpl.cpp xsldbggloballistitem.cpp xsldbgentitiesimpl.cpp xsldbgdoc.cpp xsldbgdialogbase.cpp xsldbgdebugger.cpp xsldbgconfigimpl.cpp xsldbgcallstackimpl.cpp xsldbgbreakpointsimpl.cpp xsldbgbreakpointlistitem.cpp qxsldbgdoc.cpp kxsldbg_part.cpp kxsldbg_partif.skel xsldbgwalkspeed.ui xsldbgtemplates.ui xsldbgsources.ui xsldbgmsgdialog.ui xsldbglocalvariables.ui xsldbgglobalvariables.ui xsldbgentities.ui xsldbgconfig.ui xsldbgcallstack.ui xsldbgbreakpoints.ui libkxsldbgcommon_la_METASOURCES = AUTO -libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor +libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor libkxsldbgcommon_la_LIBADD = libxsldbg/libxsldbg.la libqtnotfier/libqtnotfier.la noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbreakpointsimpl.h xsldbgcallstackimpl.h xsldbgconfigimpl.h xsldbgdebugger.h xsldbgdialogbase.h xsldbgdoc.h xsldbgdocmap.h xsldbgentitiesimpl.h xsldbggloballistitem.h xsldbgglobalvariablesimpl.h xsldbginspector.h xsldbglistitem.h xsldbglocallistitem.h xsldbglocalvariablesimpl.h xsldbgmsgdialogimpl.h xsldbgoutputview.h xsldbgsourcesimpl.h xsldbgtemplatelistitem.h xsldbgtemplatesimpl.h xsldbgwalkspeedimpl.h @@ -15,7 +15,7 @@ INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes) CXXFLAGS += $(ICU_CXXFLAGS) -libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP +libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries) $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP libkxsldbgpart_la_LIBADD = libkxsldbgcommon.la $(LIB_TDEPARTS) quanta/components/debugger/dbgp/Makefile.amdiff --git a/quanta/components/debugger/dbgp/Makefile.am b/quanta/components/debugger/dbgp/Makefile.am index 0350eda..c920fc7 100644 --- a/quanta/components/debugger/dbgp/Makefile.am +++ b/quanta/components/debugger/dbgp/Makefile.am @@ -4,7 +4,7 @@ quantadebuggerdbgp_la_SOURCES = quantadebuggerdbgp.cpp dbgpsettingss.ui \ dbgpsettings.cpp dbgpnetwork.cpp qbytearrayfifo.cpp -quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor +quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor quantadebuggerdbgp_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_TDEPARTS) kde_services_DATA = quantadebuggerdbgp.desktop quanta/components/debugger/gubed/Makefile.amdiff --git a/quanta/components/debugger/gubed/Makefile.am b/quanta/components/debugger/gubed/Makefile.am index e358c74..14c274d 100644 --- a/quanta/components/debugger/gubed/Makefile.am +++ b/quanta/components/debugger/gubed/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = quantadebuggergubed.la quantadebuggergubed_la_SOURCES = gubedsettingss.ui quantadebuggergubed.cpp gubedsettings.cpp -quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor +quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio -ltdeparts -lDCOP -ltdetexteditor quantadebuggergubed_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_TDEPARTS) kde_services_DATA = quantadebuggergubed.desktop quanta/src/Makefile.amdiff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am index 126b631..82ba1b0 100644 --- a/quanta/src/Makefile.am +++ b/quanta/src/Makefile.am @@ -64,7 +64,7 @@ quanta_METASOURCES = AUTO # the library search path. -quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lX11 +quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lX11 # this is where the kdelnk file will go xdg_apps_DATA = quanta.desktop |
||