From 50f8377beecb01ff8b5e0a767c9ef2047a715076 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:19:58 +0900 Subject: LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- kjsembed/Makefile.am | 6 +++--- kjsembed/bindings/Makefile.am | 2 +- kjsembed/builtins/Makefile.am | 4 ++-- kjsembed/cpptests/jsaccess/Makefile.am | 2 +- kjsembed/docs/embedding/simple-embed/Makefile.am | 2 +- kjsembed/plugin/Makefile.am | 2 +- kjsembed/plugins/Makefile.am | 18 +++++++++--------- kjsembed/qtbindings/Makefile.am | 2 +- kjsembed/tdescript/Makefile.am | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kjsembed') diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am index 2b25cd12..3f9b9878 100644 --- a/kjsembed/Makefile.am +++ b/kjsembed/Makefile.am @@ -48,17 +48,17 @@ kjsembedinclude_HEADERS = jsconsolewidget.h \ jsbindingplugin.h \ global.h -libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) +libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \ builtins/libkjsembedbuiltins.la \ qtbindings/libkjsembedqtbindings.la \ -ltqui \ - $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \ + $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \ $(LIB_TDEFILE) $(LIB_TDEHTML) -lkjs $(LIBSOCKET) kjscmd_SOURCES = kjscmd.cpp -kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) +kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) kjscmd_LDADD = libkjsembed.la man_MANS = kjscmd.1 diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am index 2020e182..2c6a187e 100644 --- a/kjsembed/bindings/Makefile.am +++ b/kjsembed/bindings/Makefile.am @@ -21,7 +21,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \ size_imp.cpp libkjsembedbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \ +libkjsembedbindings_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \ $(LIB_TDEFILE) $(LIBSOCKET) libkjsembedbindings_la_METASOURCES = AUTO diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am index c8005c71..0a0ef2db 100644 --- a/kjsembed/builtins/Makefile.am +++ b/kjsembed/builtins/Makefile.am @@ -11,8 +11,8 @@ libkjsembedbuiltins_la_SOURCES = stdaction_imp.cpp \ qdir_imp.cpp \ qfile_imp.cpp -libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \ +libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkjsembedbuiltins_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \ $(LIB_TDEFILE) -lkjs $(LIBSOCKET) libkjsembedbuiltins_la_METASOURCES = AUTO diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am index cb71f53d..69feea06 100644 --- a/kjsembed/cpptests/jsaccess/Makefile.am +++ b/kjsembed/cpptests/jsaccess/Makefile.am @@ -8,7 +8,7 @@ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST noinst_PROGRAMS = jsaccess jsaccess_SOURCES = jsaccess.cpp -jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) +jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) jsaccess_LDADD = $(top_builddir)/kjsembed/libkjsembed.la METASOURCES = AUTO diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am index 6625effb..74e61a97 100644 --- a/kjsembed/docs/embedding/simple-embed/Makefile.am +++ b/kjsembed/docs/embedding/simple-embed/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = embedjs INCLUDES = -I$(top_srcdir) $(all_includes) # the library search path. -embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. embedjs_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am index 8ea341fe..4d442105 100644 --- a/kjsembed/plugin/Makefile.am +++ b/kjsembed/plugin/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libjsconsoleplugin.la METASOURCES = AUTO libjsconsoleplugin_la_SOURCES = jsconsoleplugin.cpp -libjsconsoleplugin_la_LIBADD = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_QT) $(LIB_TDEPARTS) ../libkjsembed.la +libjsconsoleplugin_la_LIBADD = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_TQT) $(LIB_TDEPARTS) ../libkjsembed.la libjsconsoleplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) #pluginsdir = $(kde_datadir)/konqueror/kpartplugins diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index e67b1c65..7cfbe5ff 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -7,27 +7,27 @@ METASOURCES = AUTO # the Plugin's source, library search path, and link libraries libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp -libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la +libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) +libcustomobjectplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp -libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la +libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) +libcustomqobjectplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libimagefxplugin_la_SOURCES = imagefx_plugin.cpp -libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la +libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) +libimagefxplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libqprocessplugin_la_SOURCES = qprocess_plugin.cpp -libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) -libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la +libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries) +libqprocessplugin_la_LIBADD = $(LIB_TQT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la # the Plugin's source, library search path, and link libraries libfileitemplugin_la_SOURCES = tdefileitemloader.cpp -libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries) +libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx $(all_libraries) libfileitemplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../libkjsembed.la diff --git a/kjsembed/qtbindings/Makefile.am b/kjsembed/qtbindings/Makefile.am index 5c1af082..98d004e3 100644 --- a/kjsembed/qtbindings/Makefile.am +++ b/kjsembed/qtbindings/Makefile.am @@ -28,7 +28,7 @@ libkjsembedqtbindings_la_SOURCES = qlistviewitem_imp.cpp \ qmenuitem_imp.cpp libkjsembedqtbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -libkjsembedqtbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +libkjsembedqtbindings_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) libkjsembedqtbindings_la_METASOURCES = AUTO diff --git a/kjsembed/tdescript/Makefile.am b/kjsembed/tdescript/Makefile.am index adcf52d4..c026dc48 100644 --- a/kjsembed/tdescript/Makefile.am +++ b/kjsembed/tdescript/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libjavascript.la libjavascript_la_SOURCES = javascript.cpp -libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -no-undefined -avoid-version +libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -no-undefined -avoid-version libjavascript_la_LIBADD = -ltdescript ../libkjsembed.la -- cgit v1.2.3