From 120ffbbb2f2c5ae6ebec91ffbfce34ed006c5d8a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:20:10 +0900 Subject: LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- kaffeine/src/Makefile.am | 2 +- kaffeine/src/input/disc/plugins/Makefile.am | 2 +- kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am | 2 +- kaffeine/src/input/dvb/plugins/epg/Makefile.am | 2 +- kaffeine/src/input/dvb/plugins/stream/Makefile.am | 2 +- kaffeine/src/player-parts/dummy-part/Makefile | 2 +- kaffeine/src/player-parts/gstreamer-part/Makefile.am | 2 +- kaffeine/src/player-parts/kaffeine-part/Makefile.am | 2 +- kaffeine/src/player-parts/xine-part/Makefile.am | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kaffeine/src/Makefile.am b/kaffeine/src/Makefile.am index 952b4ed..65b567a 100644 --- a/kaffeine/src/Makefile.am +++ b/kaffeine/src/Makefile.am @@ -27,7 +27,7 @@ kaffeine_SOURCES = main.cpp \ tdemultitabbar.cpp \ inputmanager.cpp -kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kaffeine_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor if with_dvb DVBLIB = input/dvb/libkaffeinedvb.la diff --git a/kaffeine/src/input/disc/plugins/Makefile.am b/kaffeine/src/input/disc/plugins/Makefile.am index dab8353..e8661d2 100644 --- a/kaffeine/src/input/disc/plugins/Makefile.am +++ b/kaffeine/src/input/disc/plugins/Makefile.am @@ -18,7 +18,7 @@ kaffeineincludedir = $(includedir)/kaffeine kaffeineinclude_HEADERS = kaffeineaudioencoder.h libkaffeineaudioencoder_la_SOURCES = kaffeineaudioencoder.cpp -libkaffeineaudioencoder_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) $(LIB_OGGVORBIS) +libkaffeineaudioencoder_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) $(LIB_OGGVORBIS) libkaffeineaudioencoder_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined kde_servicetypes_DATA = kaffeineaudioencoder.desktop diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am b/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am index 90e8338..d6c88b0 100644 --- a/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am +++ b/kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am @@ -10,7 +10,7 @@ noinst_HEADERS = koggenc.h libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS) -libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -avoid-version -no-undefined +libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -avoid-version -no-undefined # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/kaffeine/src/input/dvb/plugins/epg/Makefile.am b/kaffeine/src/input/dvb/plugins/epg/Makefile.am index 33babab..482b04f 100644 --- a/kaffeine/src/input/dvb/plugins/epg/Makefile.am +++ b/kaffeine/src/input/dvb/plugins/epg/Makefile.am @@ -10,7 +10,7 @@ kaffeineincludedir = $(includedir)/kaffeine kaffeineinclude_HEADERS = kaffeinedvbevents.h kaffeinedvbsection.h libkaffeineepgplugin_la_SOURCES = kaffeinedvbevents.cpp kaffeinedvbsection.cpp -libkaffeineepgplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) +libkaffeineepgplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) libkaffeineepgplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined kde_servicetypes_DATA = kaffeineepgplugin.desktop diff --git a/kaffeine/src/input/dvb/plugins/stream/Makefile.am b/kaffeine/src/input/dvb/plugins/stream/Makefile.am index 033d4b8..a3f6606 100644 --- a/kaffeine/src/input/dvb/plugins/stream/Makefile.am +++ b/kaffeine/src/input/dvb/plugins/stream/Makefile.am @@ -10,7 +10,7 @@ kaffeineincludedir = $(includedir)/kaffeine kaffeineinclude_HEADERS = kaffeinedvbplugin.h libkaffeinedvbplugin_la_SOURCES = kaffeinedvbplugin.cpp -libkaffeinedvbplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) +libkaffeinedvbplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) libkaffeinedvbplugin_la_LDFLAGS = $(all_libraries) -version-info 0:1:0 -no-undefined kde_servicetypes_DATA = kaffeinedvbplugin.desktop diff --git a/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile index af9cd71..4916a91 100644 --- a/kaffeine/src/player-parts/dummy-part/Makefile +++ b/kaffeine/src/player-parts/dummy-part/Makefile @@ -162,7 +162,7 @@ LIB_LAME = -lmp3lame LIB_OGGVORBIS = -lvorbisenc -lvorbis -lm -logg LIB_POLL = LIB_QPE = -LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread +LIB_TQT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread LIB_SMB = -lsmb LIB_X11 = -lX11 $(LIBSOCKET) LIB_XCB = diff --git a/kaffeine/src/player-parts/gstreamer-part/Makefile.am b/kaffeine/src/player-parts/gstreamer-part/Makefile.am index 16cbbbd..e2f3265 100644 --- a/kaffeine/src/player-parts/gstreamer-part/Makefile.am +++ b/kaffeine/src/player-parts/gstreamer-part/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = gstreamer_part.h timer.h video.h videosettings.h gstreamerconf libgstreamerpart_la_SOURCES = gstreamer_part.cpp video.cpp timer.cpp videosettings.cpp gstreamerconfig.cpp libgstreamerpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../kaffeine-part/libkaffeinepart.la -libgstreamerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_GSTREAMER) $(LIB_GSTOVERLAY) $(all_libraries) -avoid-version -no-undefined +libgstreamerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_GSTREAMER) $(LIB_GSTOVERLAY) $(all_libraries) -avoid-version -no-undefined # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/kaffeine/src/player-parts/kaffeine-part/Makefile.am b/kaffeine/src/player-parts/kaffeine-part/Makefile.am index 7555424..a88b993 100644 --- a/kaffeine/src/player-parts/kaffeine-part/Makefile.am +++ b/kaffeine/src/player-parts/kaffeine-part/Makefile.am @@ -8,5 +8,5 @@ kaffeineinclude_HEADERS = kaffeinepart.h mrl.h METASOURCES = AUTO libkaffeinepart_la_SOURCES = kaffeinepart.cpp mrl.cpp playlistimport.cpp -libkaffeinepart_la_LIBADD = $(LIB_TDEPARTS) $(all_libraries) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) +libkaffeinepart_la_LIBADD = $(LIB_TDEPARTS) $(all_libraries) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) libkaffeinepart_la_LDFLAGS = -no-undefined -avoid-version diff --git a/kaffeine/src/player-parts/xine-part/Makefile.am b/kaffeine/src/player-parts/xine-part/Makefile.am index b87656b..a48b838 100644 --- a/kaffeine/src/player-parts/xine-part/Makefile.am +++ b/kaffeine/src/player-parts/xine-part/Makefile.am @@ -14,7 +14,7 @@ libxinepart_la_SOURCES = xine_part.cpp kxinewidget.cpp postfilter.cpp deinterlac videosettings.cpp filterdialog.cpp screenshotpreview.cpp xineconfig.cpp positionslider.cpp \ equalizer.cpp xine_part_iface.skel libxinepart_la_LIBADD = $(LIB_XINERAMA) $(LIB_XINE) $(LIB_XCB) ../kaffeine-part/libkaffeinepart.la -libxinepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -avoid-version -no-undefined +libxinepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) -avoid-version -no-undefined # this is where the desktop file will go -- cgit v1.2.3