diff --git a/.gitignore b/.gitignore index ca1fd243..707c2efd 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,7 @@ tests/log_unlink_test tests/mcast_recv_test tests/notification_test tests/rdxml_parse_test +tests/readcd_test tests/reserve_carts_test tests/sas_switch_torture tests/sas_torture diff --git a/ChangeLog b/ChangeLog index 30d521df..34105cca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19434,3 +19434,7 @@ 2020-01-28 Fred Gleason * Added a section concerning default configuration files to the 'PULL REQUEST CHECKLIST' section of 'CODINGSTYLE'. +2020-01-28 Fred Gleason + * Added a 'libmusicbrainz5' dependency. + * Added a 'libdiscid' dependency. + * Added a 'readcd_test' test harness. diff --git a/INSTALL b/INSTALL index 31e6756e..eb2d35f3 100644 --- a/INSTALL +++ b/INSTALL @@ -22,6 +22,14 @@ LibCurl, v7.19.0 or later A client-side URL transfer library. Included with most distros, or available at: http://curl.haxx.se/libcurl/. +LibDiscId, v0.6.2 or later +A library for reading the attributes of audio CDs. +Available at https://musicbrainz.org/ + +LibMusicBrainz, v5.0.1 or later +A library for accessing the MusicBrainz open music encyclopedia +Available at https://musicbrainz.org/ + LibParanoia A library for ripping audio CDs. Included in most distributions, but also available from http://www.xiph.org/paranoia/. diff --git a/cae/Makefile.am b/cae/Makefile.am index 544f10b0..c74ead2f 100644 --- a/cae/Makefile.am +++ b/cae/Makefile.am @@ -2,7 +2,7 @@ ## ## Core Audio Engine Makefile.am for Rivendell ## -## Copyright 2002-2019 Fred Gleason +## Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,7 +19,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -45,6 +45,7 @@ caed_LDADD = @LIB_RDLIBS@\ @LIBSRC@\ @LIBVORBIS@\ @QT4_LIBS@\ + @MUSICBRAINZ_LIBS@\ -lQt3Support CLEANFILES = *~\ diff --git a/configure.ac b/configure.ac index ef9a8f3c..e8e772cd 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl dnl Autoconf configuration for Rivendell. dnl Use autoconf to process this into a configure script dnl -dnl (C) Copyright 2002-2019 Fred Gleason +dnl (C) Copyright 2002-2020 Fred Gleason dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License version 2 as @@ -236,6 +236,11 @@ else fi fi +# +# Check for MusicBrainz support libraries (libdiscid and libmusicbrainz) +# +PKG_CHECK_MODULES(MUSICBRAINZ,libdiscid libmusicbrainz5,,[AC_MSG_ERROR([*** LibMusicBrainz not found ***])]) + # # Check for Id3Lib # diff --git a/importers/Makefile.am b/importers/Makefile.am index 0010de4e..9ca82872 100644 --- a/importers/Makefile.am +++ b/importers/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/importers ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -37,11 +37,11 @@ bin_PROGRAMS = nexgen_filter\ dist_nexgen_filter_SOURCES = nexgen_filter.cpp nexgen_filter.h nodist_nexgen_filter_SOURCES = moc_nexgen_filter.cpp -nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_panel_copy_SOURCES = panel_copy.cpp panel_copy.h nodist_panel_copy_SOURCES = moc_panel_copy.cpp -panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_rdcatch_copy_SOURCES = rdcatch_copy.cpp rdcatch_copy.h nodist_rdcatch_copy_SOURCES = moc_rdcatch_copy.cpp @@ -49,15 +49,15 @@ rdcatch_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_rivendell_filter_SOURCES = rivendell_filter.cpp rivendell_filter.h nodist_rivendell_filter_SOURCES = moc_rivendell_filter.cpp -rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_sas_filter_SOURCES = sas_filter.cpp sas_filter.h nodist_sas_filter_SOURCES = moc_sas_filter.cpp -sas_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +sas_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_wings_filter_SOURCES = wings_filter.cpp wings_filter.h nodist_wings_filter_SOURCES = moc_wings_filter.cpp -wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = export_slax diff --git a/lib/Makefile.am b/lib/Makefile.am index beec3da2..ae6b3351 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT4_CFLAGS@ -Wno-strict-aliasing -DQT3_SUPPORT -I/usr/include/Qt3Support -I/usr/include/taglib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -Wno-strict-aliasing -DQT3_SUPPORT -I/usr/include/Qt3Support -I/usr/include/taglib MOC = @QT_MOC@ CWRAP = ../helpers/cwrap diff --git a/rdadmin/Makefile.am b/rdadmin/Makefile.am index fa3ceaf3..dc57e3af 100644 --- a/rdadmin/Makefile.am +++ b/rdadmin/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ CWRAP = ../helpers/cwrap @@ -206,7 +206,7 @@ nodist_rdadmin_SOURCES = global_credits.c\ moc_view_node_info.cpp\ moc_view_pypad_errors.cpp -rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = gpl2.html\ info_banner1.xpm\ diff --git a/rdairplay/Makefile.am b/rdairplay/Makefile.am index 52d14c7e..0ad6adaf 100644 --- a/rdairplay/Makefile.am +++ b/rdairplay/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -75,7 +75,7 @@ nodist_rdairplay_SOURCES = moc_button_log.cpp\ moc_stop_counter.cpp\ moc_wall_clock.cpp -rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support rdairplay_LDFLAGS = -rdynamic EXTRA_DIST = rdairplay.pro\ diff --git a/rdcartslots/Makefile.am b/rdcartslots/Makefile.am index 8da37cd5..090996ed 100644 --- a/rdcartslots/Makefile.am +++ b/rdcartslots/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdcartslots ## -## (C) Copyright 2012,2016 Fred Gleason +## (C) Copyright 2012-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -47,7 +47,7 @@ dist_rdcartslots_SOURCES = local_macros.cpp\ nodist_rdcartslots_SOURCES = moc_rdcartslots.cpp -rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdcartslots.pro\ rdcartslots_de.ts\ diff --git a/rdcastmanager/Makefile.am b/rdcastmanager/Makefile.am index d56049f9..ef9cda8b 100644 --- a/rdcastmanager/Makefile.am +++ b/rdcastmanager/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdcastmanager ## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -53,7 +53,7 @@ nodist_rdcastmanager_SOURCES = moc_edit_cast.cpp\ moc_pick_report_dates.cpp\ moc_rdcastmanager.cpp -rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdcastmanager.pro\ rdcastmanager_cs.ts\ diff --git a/rdcatch/Makefile.am b/rdcatch/Makefile.am index 49cdfbee..b947be30 100644 --- a/rdcatch/Makefile.am +++ b/rdcatch/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdcatch ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -72,7 +72,7 @@ nodist_rdcatch_SOURCES = moc_add_recording.cpp\ moc_vbox.cpp -rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdcatch.pro\ diff --git a/rdcatchd/Makefile.am b/rdcatchd/Makefile.am index 52735f67..6fd417a2 100644 --- a/rdcatchd/Makefile.am +++ b/rdcatchd/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -39,7 +39,7 @@ dist_rdcatchd_SOURCES = batch.cpp\ nodist_rdcatchd_SOURCES = moc_event_player.cpp\ moc_rdcatchd.cpp -rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ moc_* diff --git a/rdlibrary/Makefile.am b/rdlibrary/Makefile.am index bcf421d2..5b935c2c 100644 --- a/rdlibrary/Makefile.am +++ b/rdlibrary/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdlibrary ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -75,7 +75,7 @@ nodist_rdlibrary_SOURCES = moc_audio_cart.cpp\ moc_rdlibrary.cpp\ moc_record_cut.cpp -rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdlibrary.pro\ rdlibrary_cs.ts\ diff --git a/rdlogedit/Makefile.am b/rdlogedit/Makefile.am index 94b0dec7..a64c8eed 100644 --- a/rdlogedit/Makefile.am +++ b/rdlogedit/Makefile.am @@ -2,7 +2,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2019 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -69,7 +69,7 @@ nodist_rdlogedit_SOURCES = moc_add_meta.cpp\ moc_render_dialog.cpp\ moc_voice_tracker.cpp -rdlogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdlogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdlogedit.pro\ rdlogedit_cs.ts\ diff --git a/rdlogin/Makefile.am b/rdlogin/Makefile.am index b16c11b6..c3ae57fe 100644 --- a/rdlogin/Makefile.am +++ b/rdlogin/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -44,7 +44,7 @@ dist_rdlogin_SOURCES = rdlogin.cpp rdlogin.h nodist_rdlogin_SOURCES = moc_rdlogin.cpp -rdlogin_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdlogin_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdlogin.pro\ rdlogin_cs.ts\ diff --git a/rdlogmanager/Makefile.am b/rdlogmanager/Makefile.am index 3722cbb6..fce40402 100644 --- a/rdlogmanager/Makefile.am +++ b/rdlogmanager/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -95,7 +95,7 @@ nodist_rdlogmanager_SOURCES = moc_add_clock.cpp\ moc_svc_rec_dialog.cpp\ moc_viewreportdialog.cpp -rdlogmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdlogmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdlogmanager.pro\ rdlogmanager_cs.ts\ diff --git a/rdmonitor/Makefile.am b/rdmonitor/Makefile.am index 5678c61e..9ea08ee5 100644 --- a/rdmonitor/Makefile.am +++ b/rdmonitor/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2012-2018 Fred Gleason +## (C) Copyright 2012-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -46,7 +46,7 @@ dist_rdmonitor_SOURCES = positiondialog.cpp positiondialog.h\ nodist_rdmonitor_SOURCES = moc_positiondialog.cpp\ moc_rdmonitor.cpp -rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdmonitor.pro\ rdmonitor_cs.ts\ diff --git a/rdpadd/Makefile.am b/rdpadd/Makefile.am index d29f9018..889c2bef 100644 --- a/rdpadd/Makefile.am +++ b/rdpadd/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell PAD Consolidation Server ## -## (C) Copyright 2018 Fred Gleason +## (C) Copyright 2018-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -35,7 +35,7 @@ dist_rdpadd_SOURCES = rdpadd.cpp rdpadd.h nodist_rdpadd_SOURCES = moc_rdpadd.cpp -rdpadd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdpadd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/rdpadengined/Makefile.am b/rdpadengined/Makefile.am index 0e9c8756..43e0d8c0 100644 --- a/rdpadengined/Makefile.am +++ b/rdpadengined/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell PyPAD Script Host ## -## (C) Copyright 2018 Fred Gleason +## (C) Copyright 2018-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -35,7 +35,7 @@ dist_rdpadengined_SOURCES = rdpadengined.cpp rdpadengined.h nodist_rdpadengined_SOURCES = moc_rdpadengined.cpp -rdpadengined_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdpadengined_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/rdpanel/Makefile.am b/rdpanel/Makefile.am index 477a94e2..6ca72a85 100644 --- a/rdpanel/Makefile.am +++ b/rdpanel/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -45,7 +45,7 @@ dist_rdpanel_SOURCES = globals.h\ nodist_rdpanel_SOURCES = moc_rdpanel.cpp -rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdpanel.pro\ rdpanel_cs.ts\ diff --git a/rdrepld/Makefile.am b/rdrepld/Makefile.am index 87f84cf0..62b73a4a 100644 --- a/rdrepld/Makefile.am +++ b/rdrepld/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2010,2016-2018 Fred Gleason +## (C) Copyright 2010-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -32,7 +32,7 @@ dist_rdrepld_SOURCES = rdrepld.cpp rdrepld.h \ replfactory.cpp replfactory.h\ citadelxds.cpp citadelxds.h nodist_rdrepld_SOURCES = moc_rdrepld.cpp -rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~ moc_* DISTCLEANFILES = moc_* diff --git a/rdselect/Makefile.am b/rdselect/Makefile.am index f1b2e56f..416f26d2 100644 --- a/rdselect/Makefile.am +++ b/rdselect/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2012-2018 Fred Gleason +## (C) Copyright 2012-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -48,7 +48,7 @@ dist_rdselect_SOURCES = rdselect.cpp rdselect.h nodist_rdselect_SOURCES = moc_rdselect.cpp -rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rd.audiostore.autofs\ rdselect.pro\ diff --git a/rdservice/Makefile.am b/rdservice/Makefile.am index 7491a8a2..626edd76 100644 --- a/rdservice/Makefile.am +++ b/rdservice/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell Services Manager ## -## (C) Copyright 2018 Fred Gleason +## (C) Copyright 2018-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -38,7 +38,7 @@ dist_rdservice_SOURCES = maint_routines.cpp\ nodist_rdservice_SOURCES = moc_rdservice.cpp -rdservice_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdservice_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ moc_* diff --git a/rdvairplayd/Makefile.am b/rdvairplayd/Makefile.am index 795922ae..a492d57f 100644 --- a/rdvairplayd/Makefile.am +++ b/rdvairplayd/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2018 Fred Gleason +## (C) Copyright 2018-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -32,7 +32,7 @@ dist_rdvairplayd_SOURCES = local_macros.cpp\ nodist_rdvairplayd_SOURCES = moc_rdvairplayd.cpp -rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/ripcd/Makefile.am b/ripcd/Makefile.am index 9d82fb73..c374e219 100644 --- a/ripcd/Makefile.am +++ b/ripcd/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell Interprocess Communication Daemon Makefile.am ## -## (C) Copyright 2002-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -134,6 +134,7 @@ ripcd_LDADD = @LIB_RDLIBS@\ @QT4_LIBS@\ @LIBHPI@\ @LIBJACK@\ + @MUSICBRAINZ_LIBS@\ -lQt3Support CLEANFILES = *~\ diff --git a/tests/Makefile.am b/tests/Makefile.am index fbaa1002..3efd85f7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -40,6 +40,7 @@ noinst_PROGRAMS = audio_convert_test\ mcast_recv_test\ notification_test\ rdxml_parse_test\ + readcd_test\ reserve_carts_test\ stringcode_test\ test_hash\ @@ -49,71 +50,74 @@ noinst_PROGRAMS = audio_convert_test\ wav_chunk_test dist_audio_convert_test_SOURCES = audio_convert_test.cpp audio_convert_test.h -audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_audio_export_test_SOURCES = audio_export_test.cpp audio_export_test.h -audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_audio_import_test_SOURCES = audio_import_test.cpp audio_import_test.h -audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_audio_metadata_test_SOURCES = audio_metadata_test.cpp audio_metadata_test.h -audio_metadata_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +audio_metadata_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_audio_peaks_test_SOURCES = audio_peaks_test.cpp audio_peaks_test.h -audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_datedecode_test_SOURCES = datedecode_test.cpp datedecode_test.h -datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_dateparse_test_SOURCES = dateparse_test.cpp dateparse_test.h -dateparse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +dateparse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_db_charset_test_SOURCES = db_charset_test.cpp db_charset_test.h -db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_download_test_SOURCES = download_test.cpp download_test.h -download_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +download_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_getpids_test_SOURCES = getpids_test.cpp getpids_test.h -getpids_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +getpids_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_log_unlink_test_SOURCES = log_unlink_test.cpp log_unlink_test.h nodist_log_unlink_test_SOURCES = moc_log_unlink_test.cpp -log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_mcast_recv_test_SOURCES = mcast_recv_test.cpp mcast_recv_test.h nodist_mcast_recv_test_SOURCES = moc_mcast_recv_test.cpp -mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_notification_test_SOURCES = notification_test.cpp notification_test.h nodist_notification_test_SOURCES = moc_notification_test.cpp -notification_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +notification_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_rdxml_parse_test_SOURCES = rdxml_parse_test.cpp rdxml_parse_test.h -rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support + +dist_readcd_test_SOURCES = readcd_test.cpp readcd_test.h +readcd_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_reserve_carts_test_SOURCES = reserve_carts_test.cpp reserve_carts_test.h -reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_stringcode_test_SOURCES = stringcode_test.cpp stringcode_test.h -stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_test_hash_SOURCES = test_hash.cpp test_hash.h -test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_test_pam_SOURCES = test_pam.cpp test_pam.h -test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_timer_test_SOURCES = timer_test.cpp timer_test.h nodist_timer_test_SOURCES = moc_timer_test.cpp -timer_test_LDADD = @QT4_LIBS@ -lQt3Support +timer_test_LDADD = @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_upload_test_SOURCES = upload_test.cpp upload_test.h -upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support dist_wav_chunk_test_SOURCES = wav_chunk_test.cpp wav_chunk_test.h -wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rivendell_standard.txt\ visualtraffic.txt diff --git a/tests/readcd_test.cpp b/tests/readcd_test.cpp new file mode 100644 index 00000000..68a98139 --- /dev/null +++ b/tests/readcd_test.cpp @@ -0,0 +1,113 @@ +// readcd_test.cpp +// +// Test the Rivendell CD reader routines +// +// (C) Copyright 2013-2020 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// + +#include +#include + +#include + +#include + +#include + +#include "readcd_test.h" + +MainObject::MainObject(QObject *parent) + :QObject(parent) +{ + QString device=""; + bool extended=false; + + // + // Read Command Options + // + RDCmdSwitch *cmd= + new RDCmdSwitch(qApp->argc(),qApp->argv(),"readcd_test", + READCD_TEST_USAGE); + for(unsigned i=0;ikeys();i++) { + if(cmd->key(i)=="--device") { + device=cmd->value(i); + cmd->setProcessed(i,true); + } + if(cmd->key(i)=="--extended") { + extended=true; + cmd->setProcessed(i,true); + } + if(!cmd->processed(i)) { + fprintf(stderr,"readcd_test: unknown option \"%s\"\n", + (const char *)cmd->key(i)); + exit(1); + } + } + if(device.isEmpty()) { + fprintf(stderr,"readcd_test: you must specify a CD device\n"); + exit(1); + } + + // + // Read the disc + // + DiscId *disc=discid_new(); + if(extended) { + if(discid_read(disc,device.toUtf8())==0) { + fprintf(stderr,"readcd_test: discid error [%s]\n", + discid_get_error_msg(disc)); + exit(1); + } + } + else { + if(discid_read_sparse(disc,device.toUtf8(),0)==0) { + fprintf(stderr,"readcd_test: discid error [%s]\n", + discid_get_error_msg(disc)); + exit(1); + } + } + + // + // Print Results + // + printf(" FreeDB DiscID: %s\n",discid_get_freedb_id(disc)); + printf(" MusicBrainz DiscID: %s\n",discid_get_id(disc)); + printf("MusicBrainz Submission URL: %s\n",discid_get_submission_url(disc)); + printf("Media Catalog Number (MCN): %s\n",discid_get_mcn(disc)); + if(extended) { + int first=discid_get_first_track_num(disc); + int last=discid_get_last_track_num(disc); + for(int i=first;i<=last;i++) { + printf(" Track %02d ISRC: %s\n",i, + discid_get_track_isrc(disc,i)); + } + } + + // + // Cleanup + // + discid_free(disc); + + exit(0); +} + + +int main(int argc,char *argv[]) +{ + QApplication a(argc,argv,false); + new MainObject(); + return a.exec(); +} diff --git a/tests/readcd_test.h b/tests/readcd_test.h new file mode 100644 index 00000000..b8b39c70 --- /dev/null +++ b/tests/readcd_test.h @@ -0,0 +1,35 @@ +// readcd_test.h +// +// Test the Rivendell CD reader routines +// +// (C) Copyright 2013-2020 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// + +#ifndef READCD_TEST_H +#define READCD_TEST_H + +#include + +#define READCD_TEST_USAGE "[options]\n\nTest the Rivendell CD reading routines\n\nOptions are:\n--device\n CD reader device\n\n--extended\n Attempt to read extended per-track data\n\n" + +class MainObject : public QObject +{ + public: + MainObject(QObject *parent=0); +}; + + +#endif // READCD_TEST_H diff --git a/utils/rdalsaconfig/Makefile.am b/utils/rdalsaconfig/Makefile.am index e17a5310..ef1805a6 100644 --- a/utils/rdalsaconfig/Makefile.am +++ b/utils/rdalsaconfig/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2009-2019 Fred Gleason +## (C) Copyright 2009-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## Use automake to process this into a Makefile.in ## -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -36,7 +36,7 @@ dist_rdalsaconfig_SOURCES = alsaitem.cpp alsaitem.h\ nodist_rdalsaconfig_SOURCES = moc_rdalsamodel.cpp\ moc_rdalsaconfig.cpp -rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ -lQt3Support +rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdalsaconfig.pro diff --git a/utils/rdcheckcuts/Makefile.am b/utils/rdcheckcuts/Makefile.am index 2eb4aab5..db0da22a 100644 --- a/utils/rdcheckcuts/Makefile.am +++ b/utils/rdcheckcuts/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2012,2016 Fred Gleason +## (C) Copyright 2012-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdcheckcuts dist_rdcheckcuts_SOURCES = rdcheckcuts.cpp rdcheckcuts.h -rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdcleandirs/Makefile.am b/utils/rdcleandirs/Makefile.am index bc4617cd..dd5119fb 100644 --- a/utils/rdcleandirs/Makefile.am +++ b/utils/rdcleandirs/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2015-2018 Fred Gleason +## (C) Copyright 2015-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ sbin_PROGRAMS = rdcleandirs dist_rdcleandirs_SOURCES = rdcleandirs.cpp rdcleandirs.h -rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rdclilogedit/Makefile.am b/utils/rdclilogedit/Makefile.am index f5e9c17e..b0b7ad1f 100644 --- a/utils/rdclilogedit/Makefile.am +++ b/utils/rdclilogedit/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2016-2018 Fred Gleason +## (C) Copyright 2016-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -34,7 +34,7 @@ dist_rdclilogedit_SOURCES = help.cpp\ nodist_rdclilogedit_SOURCES = moc_rdclilogedit.cpp -rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdcollect/Makefile.am b/utils/rdcollect/Makefile.am index b9d0fa1c..bbbfab28 100644 --- a/utils/rdcollect/Makefile.am +++ b/utils/rdcollect/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2010,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdcollect dist_rdcollect_SOURCES = rdcollect.cpp rdcollect.h -rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rdconvert/Makefile.am b/utils/rdconvert/Makefile.am index 4ea3881d..d9344f92 100644 --- a/utils/rdconvert/Makefile.am +++ b/utils/rdconvert/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2017-2018 Fred Gleason +## (C) Copyright 2017-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdconvert dist_rdconvert_SOURCES = rdconvert.cpp rdconvert.h -rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rddbconfig/Makefile.am b/utils/rddbconfig/Makefile.am index bff82c4a..b3be8191 100644 --- a/utils/rddbconfig/Makefile.am +++ b/utils/rddbconfig/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2009,2016-2018 Fred Gleason +## (C) Copyright 2009-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## Use automake to process this into a Makefile.in ## -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -33,7 +33,7 @@ dist_rddbconfig_SOURCES = rddbconfig.cpp rddbconfig.h mysql_login.cpp mysql_logi nodist_rddbconfig_SOURCES = moc_rddbconfig.cpp moc_mysql_login.cpp -rddbconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ -lQt3Support +rddbconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.qm\ diff --git a/utils/rddbmgr/Makefile.am b/utils/rddbmgr/Makefile.am index be5d077a..a292c814 100644 --- a/utils/rddbmgr/Makefile.am +++ b/utils/rddbmgr/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2018 Fred Gleason +## (C) Copyright 2018-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -fno-var-tracking-assignments -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -fno-var-tracking-assignments -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -36,7 +36,7 @@ dist_rddbmgr_SOURCES = check.cpp\ schemamap.cpp\ updateschema.cpp -rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rddelete/Makefile.am b/utils/rddelete/Makefile.am index ecd3d452..a38466fe 100644 --- a/utils/rddelete/Makefile.am +++ b/utils/rddelete/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rddelete_SOURCES = rddelete.cpp rddelete.h nodist_rddelete_SOURCES = moc_rddelete.cpp -rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rddgimport/Makefile.am b/utils/rddgimport/Makefile.am index ac7adf9a..243160d6 100644 --- a/utils/rddgimport/Makefile.am +++ b/utils/rddgimport/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -44,7 +44,7 @@ dist_rddgimport_SOURCES = event.cpp event.h\ nodist_rddgimport_SOURCES = moc_rddgimport.cpp -rddgimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rddgimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rddgimport.pro\ rddgimport_de.ts\ diff --git a/utils/rddiscimport/Makefile.am b/utils/rddiscimport/Makefile.am index 8198a00e..87f877a6 100644 --- a/utils/rddiscimport/Makefile.am +++ b/utils/rddiscimport/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -45,7 +45,7 @@ dist_rddiscimport_SOURCES = metalibrary.cpp metalibrary.h\ nodist_rddiscimport_SOURCES = moc_rddiscimport.cpp -rddiscimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rddiscimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rddiscimport.pro\ rddiscimport_de.ts\ diff --git a/utils/rdexport/Makefile.am b/utils/rdexport/Makefile.am index 8e72d351..206d0937 100644 --- a/utils/rdexport/Makefile.am +++ b/utils/rdexport/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2016-2018 Fred Gleason +## (C) Copyright 2016-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdexport_SOURCES = rdexport.cpp rdexport.h nodist_rdexport_SOURCES = moc_rdexport.cpp -rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdgpimon/Makefile.am b/utils/rdgpimon/Makefile.am index 92662642..c01b292c 100644 --- a/utils/rdgpimon/Makefile.am +++ b/utils/rdgpimon/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -45,7 +45,7 @@ dist_rdgpimon_SOURCES = gpi_label.cpp gpi_label.h\ nodist_rdgpimon_SOURCES = moc_gpi_label.cpp\ moc_rdgpimon.cpp -rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdgpimon.pro\ rdgpimon_cs.ts\ diff --git a/utils/rdimport/Makefile.am b/utils/rdimport/Makefile.am index af898efe..0fdfd8f4 100644 --- a/utils/rdimport/Makefile.am +++ b/utils/rdimport/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -32,7 +32,7 @@ dist_rdimport_SOURCES = markerset.cpp markerset.h\ nodist_rdimport_SOURCES = moc_rdimport.cpp -rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdmaint/Makefile.am b/utils/rdmaint/Makefile.am index aedd0a7e..cde19e0c 100644 --- a/utils/rdmaint/Makefile.am +++ b/utils/rdmaint/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2008,2016-2018 Fred Gleason +## (C) Copyright 2008-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdmaint_SOURCES = rdmaint.cpp rdmaint.h nodist_rdmaint_SOURCES = moc_rdmaint.cpp -rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdmarkerset/Makefile.am b/utils/rdmarkerset/Makefile.am index 7daa5006..236b3406 100644 --- a/utils/rdmarkerset/Makefile.am +++ b/utils/rdmarkerset/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2014,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdmarkerset_SOURCES = rdmarkerset.cpp rdmarkerset.h nodist_rdmarkerset_SOURCES = moc_rdmarkerset.cpp -rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = diff --git a/utils/rdmetadata/Makefile.am b/utils/rdmetadata/Makefile.am index add6e882..dd77ae43 100644 --- a/utils/rdmetadata/Makefile.am +++ b/utils/rdmetadata/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2014,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdmetadata_SOURCES = rdmetadata.cpp rdmetadata.h nodist_rdmetadata_SOURCES = moc_rdmetadata.cpp -rdmetadata_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdmetadata_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = diff --git a/utils/rdpopup/Makefile.am b/utils/rdpopup/Makefile.am index 337719a5..7d03f9bf 100644 --- a/utils/rdpopup/Makefile.am +++ b/utils/rdpopup/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2009,2016-2018 Fred Gleason +## (C) Copyright 2009-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdpopup dist_rdpopup_SOURCES = rdpopup.cpp rdpopup.h -rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdpurgecasts/Makefile.am b/utils/rdpurgecasts/Makefile.am index 5de5754c..287fd565 100644 --- a/utils/rdpurgecasts/Makefile.am +++ b/utils/rdpurgecasts/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2007-2018 Fred Gleason +## (C) Copyright 2007-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdpurgecasts dist_rdpurgecasts_SOURCES = rdpurgecasts.cpp rdpurgecasts.h -rdpurgecasts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdpurgecasts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdrender/Makefile.am b/utils/rdrender/Makefile.am index 07631d53..101372d2 100644 --- a/utils/rdrender/Makefile.am +++ b/utils/rdrender/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2017-2018 Fred Gleason +## (C) Copyright 2017-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdrender_SOURCES = rdrender.cpp rdrender.h nodist_rdrender_SOURCES = moc_rdrender.cpp -rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdselect_helper/Makefile.am b/utils/rdselect_helper/Makefile.am index 91228e31..3db12c94 100644 --- a/utils/rdselect_helper/Makefile.am +++ b/utils/rdselect_helper/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2018 Fred Gleason +## (C) Copyright 2018-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT4_CFLAGS@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,7 +36,7 @@ nodist_rdselect_helper_SOURCES = moc_rdselect_helper.cpp\ rdconfig.cpp rdconfig.h\ rdprofile.cpp rdprofile.h -rdselect_helper_LDADD = -lQtCore -lQtNetwork -lQt3Support +rdselect_helper_LDADD = -lQtCore -lQtNetwork -lQt3Support @MUSICBRAINZ_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdsoftkeys/Makefile.am b/utils/rdsoftkeys/Makefile.am index 754c3fa0..14f41582 100644 --- a/utils/rdsoftkeys/Makefile.am +++ b/utils/rdsoftkeys/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdsoftkeys_SOURCES = rdsoftkeys.cpp rdsoftkeys.h nodist_rdsoftkeys_SOURCES = moc_rdsoftkeys.cpp -rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rmlsend/Makefile.am b/utils/rmlsend/Makefile.am index bd06bac7..48a0034f 100644 --- a/utils/rmlsend/Makefile.am +++ b/utils/rmlsend/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2006,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -43,7 +43,7 @@ dist_rmlsend_SOURCES = rmlsend.cpp rmlsend.h nodist_rmlsend_SOURCES = moc_rmlsend.cpp -rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rmlsend.pro\ rmlsend_cs.ts\ diff --git a/web/rdcastmanager/Makefile.am b/web/rdcastmanager/Makefile.am index 7d8a7244..4c8af273 100644 --- a/web/rdcastmanager/Makefile.am +++ b/web/rdcastmanager/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2007,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -38,7 +38,7 @@ libexec_PROGRAMS = rdcastmanager.cgi dist_rdcastmanager_cgi_SOURCES = rdcastmanager.cpp rdcastmanager.h -rdcastmanager_cgi_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdcastmanager_cgi_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdcastmanager.js\ rdcastmanager.pro diff --git a/web/rdfeed/Makefile.am b/web/rdfeed/Makefile.am index a9c837d5..6253879c 100644 --- a/web/rdfeed/Makefile.am +++ b/web/rdfeed/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2007,2016-2018 Fred Gleason +## (C) Copyright 2002-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ libexec_PROGRAMS = rdfeed.xml dist_rdfeed_xml_SOURCES = rdfeed_script.cpp rdfeed_script.h -rdfeed_xml_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdfeed_xml_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdfeed.pro diff --git a/web/rdxport/Makefile.am b/web/rdxport/Makefile.am index eb1ff0b8..586aec3d 100644 --- a/web/rdxport/Makefile.am +++ b/web/rdxport/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2010,2016-2018 Fred Gleason +## (C) Copyright 2010-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -50,7 +50,7 @@ dist_rdxport_cgi_SOURCES = audioinfo.cpp\ nodist_rdxport_cgi_SOURCES = moc_rdxport.cpp -rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = rdxport.pro diff --git a/web/webget/Makefile.am b/web/webget/Makefile.am index 93cf1431..7de8877b 100644 --- a/web/webget/Makefile.am +++ b/web/webget/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2017-2018 Fred Gleason +## (C) Copyright 2017-2020 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -43,7 +43,7 @@ dist_webget_cgi_SOURCES = webget.cpp webget.h nodist_webget_cgi_SOURCES = moc_webget.cpp -webget_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ -lQt3Support +webget_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support EXTRA_DIST = webget.html\ webget.js