Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-30 07:32:32 +02:00
Code Issues Projects Releases Wiki Activity

2021-04-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added tests to the configure script to locate the correct
	versions of the Qt5 tools 'lupdate' and 'lrelease'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-07 16:10:45 -04:00
parent dd29b2bfcb
commit 299e0da2de
19 changed files with 77 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21418,3 +21418,6 @@
2021-04-07 Fred Gleason <fredg@paravelsystems.com>
* Updated all Makefile references to 'lupdate-qt4' to 'lupdate-qt5'.
* Updated all Makefile references to 'lrelease-qt4' to 'lrelease-qt5'.
2021-04-07 Fred Gleason <fredg@paravelsystems.com>
* Added tests to the configure script to locate the correct
versions of the Qt5 tools 'lupdate' and 'lrelease'.

6
configure.ac
View File

@ -123,6 +123,12 @@ PKG_CHECK_MODULES(QT5_CLI,Qt5Core Qt5Network Qt5Sql Qt5Xml,,[AC_MSG_ERROR([*** Q
AC_CHECK_PROG(MOC_NAME,moc-qt5,[moc-qt5],[moc])
AC_SUBST(QT_MOC,$MOC_NAME)
AC_CHECK_PROG(LUPDATE_NAME,lupdate-qt5,[lupdate-qt5],[lupdate])
AC_SUBST(QT_LUPDATE,$LUPDATE_NAME)
AC_CHECK_PROG(LRELEASE_NAME,lrelease-qt5,[lrelease-qt5],[lrelease])
AC_SUBST(QT_LRELEASE,$LRELEASE_NAME)
#
# Determine the target architecture

6
lib/Makefile.am
View File

@ -22,6 +22,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -Wno-strict-aliasing -std=c++11 -fPIC -I/usr/include/taglib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
CWRAP = ../helpers/cwrap
# The dependency for qt's Meta Object Compiler (moc)
@ -39,8 +41,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/librd_*.qm
all:
lupdate-qt5 lib.pro
lrelease-qt5 lib.pro
$(LUPDATE) lib.pro
$(LRELEASE) lib.pro
lib_LTLIBRARIES = librd.la
dist_librd_la_SOURCES = dbversion.h\

6
rdadmin/Makefile.am
View File

@ -23,6 +23,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
CWRAP = ../helpers/cwrap
# The dependency for qt's Meta Object Compiler (moc)
@ -44,8 +46,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdadmin_*.qm
all:
lupdate-qt5 rdadmin.pro
lrelease-qt5 rdadmin.pro
$(LUPDATE) rdadmin.pro
$(LRELEASE) rdadmin.pro
bin_PROGRAMS = rdadmin

6
rdairplay/Makefile.am
View File

@ -23,6 +23,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -37,8 +39,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdairplay_*.qm
all:
lupdate-qt5 rdairplay.pro
lrelease-qt5 rdairplay.pro
$(LUPDATE) rdairplay.pro
$(LRELEASE) rdairplay.pro
bin_PROGRAMS = rdairplay

6
rdcartslots/Makefile.am
View File

@ -23,6 +23,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -37,8 +39,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcartslots_*.qm
all:
lupdate-qt5 rdcartslots.pro
lrelease-qt5 rdcartslots.pro
$(LUPDATE) rdcartslots.pro
$(LRELEASE) rdcartslots.pro
bin_PROGRAMS = rdcartslots

6
rdcastmanager/Makefile.am
View File

@ -23,6 +23,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -37,8 +39,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcastmanager_*.qm
all:
lupdate-qt5 rdcastmanager.pro
lrelease-qt5 rdcastmanager.pro
$(LUPDATE) rdcastmanager.pro
$(LRELEASE) rdcastmanager.pro
bin_PROGRAMS = rdcastmanager

6
rdcatch/Makefile.am
View File

@ -23,6 +23,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -37,8 +39,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcatch_*.qm
all:
lupdate-qt5 rdcatch.pro
lrelease-qt5 rdcatch.pro
$(LUPDATE) rdcatch.pro
$(LRELEASE) rdcatch.pro
bin_PROGRAMS = rdcatch

6
rdhpi/Makefile.am
View File

@ -24,6 +24,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
CWRAP = ../helpers/cwrap
# The dependency for qt's Meta Object Compiler (moc)
@ -45,8 +47,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdhpi_*.qm
all:
lupdate-qt5 rdhpi.pro
lrelease-qt5 rdhpi.pro
$(LUPDATE) rdhpi.pro
$(LRELEASE) rdhpi.pro
lib_LTLIBRARIES = librdhpi.la
dist_librdhpi_la_SOURCES = rdhpiinformation.cpp rdhpiinformation.h\

6
rdlibrary/Makefile.am
View File

@ -23,6 +23,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -37,8 +39,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlibrary_*.qm
all:
lupdate-qt5 rdlibrary.pro
lrelease-qt5 rdlibrary.pro
$(LUPDATE) rdlibrary.pro
$(LRELEASE) rdlibrary.pro
bin_PROGRAMS = rdlibrary

6
rdlogedit/Makefile.am
View File

@ -21,6 +21,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -35,8 +37,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogedit_*.qm
all:
lupdate-qt5 rdlogedit.pro
lrelease-qt5 rdlogedit.pro
$(LUPDATE) rdlogedit.pro
$(LRELEASE) rdlogedit.pro
bin_PROGRAMS = rdlogedit

6
rdlogin/Makefile.am
View File

@ -21,6 +21,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -35,8 +37,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogin_*.qm
all:
lupdate-qt5 rdlogin.pro
lrelease-qt5 rdlogin.pro
$(LUPDATE) rdlogin.pro
$(LRELEASE) rdlogin.pro
bin_PROGRAMS = rdlogin

6
rdlogmanager/Makefile.am
View File

@ -21,6 +21,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -35,8 +37,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogmanager_*.qm
all:
lupdate-qt5 rdlogmanager.pro
lrelease-qt5 rdlogmanager.pro
$(LUPDATE) rdlogmanager.pro
$(LRELEASE) rdlogmanager.pro
bin_PROGRAMS = rdlogmanager

6
rdmonitor/Makefile.am
View File

@ -21,6 +21,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -35,8 +37,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdmonitor_*.qm
all:
lupdate-qt5 rdmonitor.pro
lrelease-qt5 rdmonitor.pro
$(LUPDATE) rdmonitor.pro
$(LRELEASE) rdmonitor.pro
bin_PROGRAMS = rdmonitor

6
rdpanel/Makefile.am
View File

@ -21,6 +21,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -35,8 +37,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdpanel_*.qm
all:
lupdate-qt5 rdpanel.pro
lrelease-qt5 rdpanel.pro
$(LUPDATE) rdpanel.pro
$(LRELEASE) rdpanel.pro
bin_PROGRAMS = rdpanel

6
rdselect/Makefile.am
View File

@ -21,6 +21,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -39,8 +41,8 @@ uninstall-local:
rm -f $(DESTDIR)/etc/auto.master.d/rd.audiostore.autofs
all:
lupdate-qt5 rdselect.pro
lrelease-qt5 rdselect.pro
$(LUPDATE) rdselect.pro
$(LRELEASE) rdselect.pro
bin_PROGRAMS = rdselect

6
utils/rddgimport/Makefile.am
View File

@ -20,6 +20,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -34,8 +36,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rddgimport_*.qm
all:
lupdate-qt5 rddgimport.pro
lrelease-qt5 rddgimport.pro
$(LUPDATE) rddgimport.pro
$(LRELEASE) rddgimport.pro
bin_PROGRAMS = rddgimport

6
utils/rdgpimon/Makefile.am
View File

@ -20,6 +20,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -34,8 +36,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdgpimon_*.qm
all:
lupdate-qt5 rdgpimon.pro
lrelease-qt5 rdgpimon.pro
$(LUPDATE) rdgpimon.pro
$(LRELEASE) rdgpimon.pro
bin_PROGRAMS = rdgpimon

6
utils/rmlsend/Makefile.am
View File

@ -20,6 +20,8 @@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
LUPDATE = @QT_LUPDATE@
LRELEASE = @QT_LRELEASE@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@ -34,8 +36,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rmlsend_*.qm
all:
lupdate-qt5 rmlsend.pro
lrelease-qt5 rmlsend.pro
$(LUPDATE) rmlsend.pro
$(LRELEASE) rmlsend.pro
bin_PROGRAMS = rmlsend