Branch: master

5f5b35b5 2018-09-17 09:20:04 Michele Calgaro 
LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M amarok/src/Makefile.am
M amarok/src/collectionscanner/Makefile.am
M amarok/src/device/massstorage/Makefile.am
M amarok/src/device/nfs/Makefile.am
M amarok/src/device/smb/Makefile.am
M amarok/src/engine/void/Makefile.am
M amarok/src/engine/xine/Makefile.am
M amarok/src/engine/yauap/Makefile.am
M amarok/src/konquisidebar/Makefile.am
M amarok/src/loader/Makefile.am
M amarok/src/mediadevice/daap/Makefile.am
M amarok/src/mediadevice/daap/daapreader/Makefile.am
M amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
M amarok/src/mediadevice/generic/Makefile.am
M amarok/src/mediadevice/ifp/Makefile.am
M amarok/src/mediadevice/ipod/Makefile.am
M amarok/src/mediadevice/mtp/Makefile.am
M amarok/src/mediadevice/njb/Makefile.am
M amarok/src/mediadevice/riokarma/Makefile.am
M amarok/src/scripts/graphequalizer/Makefile.am
M amarok/src/statusbar/Makefile.am

amarok/src/Makefile.am

diff --git a/amarok/src/Makefile.am b/amarok/src/Makefile.am
index 7786068..dbabf29 100644
--- a/amarok/src/Makefile.am
+++ b/amarok/src/Makefile.am
@@ -158,7 +158,7 @@
     $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
     $(top_builddir)/amarok/src/metadata/libmetadata.la \
     $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
-    $(LIB_QT) $(LIB_TDEPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_TDENEWSTUFF) \
+    $(LIB_TQT) $(LIB_TDEPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_TDENEWSTUFF) \
     $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
     $(LIB_TUNEPIMP) \
     $(mysql_libs) \
@@ -167,7 +167,7 @@
 libamarok_la_LDFLAGS = \
     $(all_libraries) \
     $(KDE_RPATH) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     -lDCOP \
     $(LIB_TDECORE) \
     $(LIB_TDEUI)
@@ -206,7 +206,7 @@
 amarokapp_LDFLAGS = \
     $(all_libraries) \
     $(KDE_RPATH) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     -lDCOP \
     $(LIB_TDECORE) \
     $(LIB_TDEUI)

amarok/src/collectionscanner/Makefile.am

diff --git a/amarok/src/collectionscanner/Makefile.am b/amarok/src/collectionscanner/Makefile.am
index 24e724a..0e6f306 100644
--- a/amarok/src/collectionscanner/Makefile.am
+++ b/amarok/src/collectionscanner/Makefile.am
@@ -19,7 +19,7 @@
 amarokcollectionscanner_LDADD = \
     $(top_builddir)/amarok/src/metadata/libmetadata.la \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     $(LIB_TDECORE) \
     $(TAGLIB_LIBS) \
     $(LIB_TDEIO)
@@ -27,7 +27,7 @@
 amarokcollectionscanner_LDFLAGS = \
     $(all_libraries) \
     $(KDE_RPATH) \
-    $(LIB_QT) \
+    $(LIB_TQT) \
     -lDCOP \
     $(LIB_TDECORE) \
     $(LIB_TDEUI) \

amarok/src/device/massstorage/Makefile.am

diff --git a/amarok/src/device/massstorage/Makefile.am b/amarok/src/device/massstorage/Makefile.am
index 5916a31..22823f9 100644
--- a/amarok/src/device/massstorage/Makefile.am
+++ b/amarok/src/device/massstorage/Makefile.am
@@ -14,7 +14,7 @@
 
 libamarok_massstorage_device_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_massstorage_device_la_LDFLAGS = \
     $(KDE_PLUGIN) \

amarok/src/device/nfs/Makefile.am

diff --git a/amarok/src/device/nfs/Makefile.am b/amarok/src/device/nfs/Makefile.am
index 5ac39d6..940acfc 100644
--- a/amarok/src/device/nfs/Makefile.am
+++ b/amarok/src/device/nfs/Makefile.am
@@ -14,7 +14,7 @@
 
 libamarok_nfs_device_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_nfs_device_la_LDFLAGS = \
     $(KDE_PLUGIN) \

amarok/src/device/s

diff --git a/amarok/src/device/smb/Makefile.am b/amarok/src/device/smb/Makefile.am
index 044e5bd..a1e77fa 100644
--- a/amarok/src/device/smb/Makefile.am
+++ b/amarok/src/device/smb/Makefile.am
@@ -14,7 +14,7 @@
 
 libamarok_smb_device_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_smb_device_la_LDFLAGS = \
     $(KDE_PLUGIN) \

amarok/src/engine/void/Makefile.am

diff --git a/amarok/src/engine/void/Makefile.am b/amarok/src/engine/void/Makefile.am
index a07ad48..9314f44 100644
--- a/amarok/src/engine/void/Makefile.am
+++ b/amarok/src/engine/void/Makefile.am
@@ -9,7 +9,7 @@
 libamarok_void_engine_plugin_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 libamarok_void_engine_plugin_la_SOURCES = \
     void-engine.cpp

amarok/src/engine/xine/Makefile.am

diff --git a/amarok/src/engine/xine/Makefile.am b/amarok/src/engine/xine/Makefile.am
index cdd2ebb..735519b 100644
--- a/amarok/src/engine/xine/Makefile.am
+++ b/amarok/src/engine/xine/Makefile.am
@@ -12,7 +12,7 @@
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
     -ltdeui -ltdecore \
-    $(XINE_LIBS) $(LIB_QT)
+    $(XINE_LIBS) $(LIB_TQT)
 
 libamarok_xine_engine_la_SOURCES = \
     xine-scope.c \

amarok/src/engine/yauap/Makefile.am

diff --git a/amarok/src/engine/yauap/Makefile.am b/amarok/src/engine/yauap/Makefile.am
index 6aaae69..0b4f54d 100644
--- a/amarok/src/engine/yauap/Makefile.am
+++ b/amarok/src/engine/yauap/Makefile.am
@@ -13,7 +13,7 @@
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/plugin/libplugin.la \
     $(LIB_YAUAP)\
-    $(LIB_TDECORE) $(LIB_QT)
+    $(LIB_TDECORE) $(LIB_TQT)
 
 
 libamarok_yauap_engine_plugin_la_SOURCES = \

amarok/src/konquisidebar/Makefile.am

diff --git a/amarok/src/konquisidebar/Makefile.am b/amarok/src/konquisidebar/Makefile.am
index 1ec0186..faa72a9 100644
--- a/amarok/src/konquisidebar/Makefile.am
+++ b/amarok/src/konquisidebar/Makefile.am
@@ -5,7 +5,7 @@
 
 konqsidebar_universalamarok_la_SOURCES = universalamarok.cpp amarokdcopiface.stub
 konqsidebar_universalamarok_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
-konqsidebar_universalamarok_la_LIBADD = $(LIB_TDEHTML) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
+konqsidebar_universalamarok_la_LIBADD = $(LIB_TDEHTML) $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
 
 
 amarokdcopiface_DIR=$(top_srcdir)/amarok/src/amarokcore

amarok/src/loader/Makefile.am

diff --git a/amarok/src/loader/Makefile.am b/amarok/src/loader/Makefile.am
index 35958f3..b624f92 100644
--- a/amarok/src/loader/Makefile.am
+++ b/amarok/src/loader/Makefile.am
@@ -7,10 +7,10 @@
         loader.cpp
 
 amarok_LDADD = \
-        $(LIB_QT) \
+        $(LIB_TQT) \
         $(LIB_TDEUI)
 
-amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO

amarok/src/mediadevice/daap/Makefile.am

diff --git a/amarok/src/mediadevice/daap/Makefile.am b/amarok/src/mediadevice/daap/Makefile.am
index 3880df1..edf6b8a 100644
--- a/amarok/src/mediadevice/daap/Makefile.am
+++ b/amarok/src/mediadevice/daap/Makefile.am
@@ -17,7 +17,7 @@
 libamarok_daap_mediadevice_la_LIBADD  = \
     $(top_builddir)/amarok/src/libamarok.la \
     $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \
-    $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
+    $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT)
 
 libamarok_daap_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \

amarok/src/mediadevice/daap/daapreader/Makefile.am

diff --git a/amarok/src/mediadevice/daap/daapreader/Makefile.am b/amarok/src/mediadevice/daap/daapreader/Makefile.am
index 6565c09..23e4d25 100644
--- a/amarok/src/mediadevice/daap/daapreader/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/Makefile.am
@@ -7,12 +7,12 @@
 libdaapreader_la_SOURCES = reader.cpp
 
 libdaapreader_la_LIBADD = \
-        $(LIB_QT) \
+        $(LIB_TQT) \
         $(LIB_TDECORE) \
         $(LIB_TDEUI) \
         $(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la
 
-libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO

amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am

diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
index 4b81e98..54ff1a7 100644
--- a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
@@ -11,11 +11,11 @@
 libauthentication_la_SOURCES = contentfetcher.cpp md5.c hasher.c
 
 libauthentication_la_LIBADD = \
-        $(LIB_QT) \
+        $(LIB_TQT) \
         $(LIB_TDECORE) \
         $(LIB_TDEUI)
 
-libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 METASOURCES = AUTO

amarok/src/mediadevice/generic/Makefile.am

diff --git a/amarok/src/mediadevice/generic/Makefile.am b/amarok/src/mediadevice/generic/Makefile.am
index 8ce3fb0..d23c8ab 100644
--- a/amarok/src/mediadevice/generic/Makefile.am
+++ b/amarok/src/mediadevice/generic/Makefile.am
@@ -15,7 +15,7 @@
 
 libamarok_generic_mediadevice_la_LIBADD  = \
     $(top_builddir)/amarok/src/libamarok.la \
-    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT)
 
 libamarok_generic_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \

amarok/src/mediadevice/ifp/Makefile.am

diff --git a/amarok/src/mediadevice/ifp/Makefile.am b/amarok/src/mediadevice/ifp/Makefile.am
index 0a572d0..5b5a8f3 100644
--- a/amarok/src/mediadevice/ifp/Makefile.am
+++ b/amarok/src/mediadevice/ifp/Makefile.am
@@ -15,7 +15,7 @@
 libamarok_ifp_mediadevice_la_LIBADD = \
     $(top_builddir)/amarok/src/libamarok.la \
     -lusb -lifp \
-    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT)
 
 libamarok_ifp_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \

amarok/src/mediadevice/ipod/Makefile.am

diff --git a/amarok/src/mediadevice/ipod/Makefile.am b/amarok/src/mediadevice/ipod/Makefile.am
index cd49a28..23efc61 100644
--- a/amarok/src/mediadevice/ipod/Makefile.am
+++ b/amarok/src/mediadevice/ipod/Makefile.am
@@ -16,7 +16,7 @@
 METASOURCES = AUTO
 
 libamarok_ipod_mediadevice_la_LIBADD  = \
-    $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
+    $(top_builddir)/amarok/src/libamarok.la $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
 
 libamarok_ipod_mediadevice_la_LDFLAGS = \
     $(KDE_PLUGIN) \
** Diff limit reached (max: 250 lines) **