From 20a1fa502af307f73443af6e4d754cd190c134c4 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 4 Nov 2024 14:16:28 -0500 Subject: [PATCH] Differentiate client name from configuration directory name. --- INSTALL | 9 +- Makefile.in | 4 +- NEWS | 6 +- Seq66cli/Makefile.in | 2 + Seq66qt5/Makefile.in | 2 + aux-files/ltmain.sh | 4 +- configure | 133 ++++++++++++++-------------- configure.ac | 91 +++++++++---------- data/Makefile.in | 2 + doc/Makefile.in | 2 + doc/latex/Makefile.in | 2 + doc/latex/tex/Makefile.in | 2 + include/cli/seq66-config.h | 17 ++-- include/config.h.in | 19 ++-- include/qt/portmidi/seq66-config.h | 12 ++- include/qt/rtmidi/seq66-config.h | 12 ++- libseq66/Makefile.in | 2 + libseq66/include/Makefile.in | 2 + libseq66/include/seq66_features.hpp | 3 +- libseq66/src/Makefile.in | 2 + libseq66/src/cfg/rcsettings.cpp | 6 +- libseq66/src/seq66_features.cpp | 11 ++- libsessions/Makefile.in | 2 + libsessions/include/Makefile.in | 2 + libsessions/src/Makefile.in | 2 + m4/Makefile.in | 2 + man/Makefile.in | 2 + resources/pixmaps/Makefile.in | 2 + seq_portmidi/Makefile.in | 2 + seq_portmidi/include/Makefile.in | 2 + seq_portmidi/src/Makefile.in | 2 + seq_qt5/Makefile.in | 2 + seq_qt5/forms/Makefile.in | 2 + seq_qt5/include/Makefile.in | 2 + seq_qt5/src/Makefile.in | 2 + seq_rtmidi/Makefile.in | 2 + seq_rtmidi/include/Makefile.in | 2 + seq_rtmidi/src/Makefile.in | 2 + 38 files changed, 236 insertions(+), 141 deletions(-) diff --git a/INSTALL b/INSTALL index 51894330..b2146390 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ INSTALL for Seq66 v. 0.99.15 and above Chris Ahlstrom -2015-09-10 to 2024-10-25 +2015-09-10 to 2024-11-04 Getting Seq66 requires building the code or going to "ahlstromcj/seq66" on GitHub to get an installation package or a Windows release executable. @@ -67,6 +67,13 @@ Autotools Build and Install: should make soft links to /usr/share/automake files in the aux-files directory. Then try the above commands again. + Another variation is to change the client/port name from the default, + which is "seq66". Add an option like the following: + + $ ./configure --with-client=myseqclient + + This change will show up in the MIDI I/O tabs in Edit / Preferences. + Also note that the qmake executable must exist. If it is not found, check for the existence of an alternate name (e.g. qmake-qt5) and make a soft link to it. diff --git a/Makefile.in b/Makefile.in index 94b13636..e12cc633 100644 --- a/Makefile.in +++ b/Makefile.in @@ -199,7 +199,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/aux-files/mkinstalldirs \ $(top_srcdir)/include/config.h.in ChangeLog INSTALL NEWS \ README.md TODO aux-files/compile aux-files/config.guess \ - aux-files/config.rpath aux-files/config.sub aux-files/depcomp \ + aux-files/config.rpath aux-files/config.sub \ aux-files/install-sh aux-files/ltmain.sh aux-files/missing \ aux-files/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -253,6 +253,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -266,6 +267,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/NEWS b/NEWS index 255c0494..06001124 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ NEWS for Seq66 0.99.16 Chris Ahlstrom -2015-07-10 to 2024-11-02 +2015-07-10 to 2024-11-04 # Change Log @@ -9,6 +9,7 @@ Chris Ahlstrom ### Changed - Refined documentation about the Import/Export functionality. +- Added CONFIG\_DIR\_NAME and cleaned up configure.ac. ### Fixed @@ -17,6 +18,9 @@ Chris Ahlstrom ### Added - Added 120 PPQN to the list of supported PPQNs. +- Added a "config directory" macro to configure.ac and seq-feature + functions to access it. Differentiates between client and directory + name. ## [0.99.15] diff --git a/Seq66cli/Makefile.in b/Seq66cli/Makefile.in index 3b242330..03d02a42 100644 --- a/Seq66cli/Makefile.in +++ b/Seq66cli/Makefile.in @@ -218,6 +218,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -231,6 +232,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/Seq66qt5/Makefile.in b/Seq66qt5/Makefile.in index e48966a0..1ff16287 100644 --- a/Seq66qt5/Makefile.in +++ b/Seq66qt5/Makefile.in @@ -220,6 +220,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -233,6 +234,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/aux-files/ltmain.sh b/aux-files/ltmain.sh index 1dea62ab..4fdde9a0 100755 --- a/aux-files/ltmain.sh +++ b/aux-files/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.7 Debian-2.4.7-7" +VERSION="2.4.7 Debian-2.4.7-8" package_revision=2.4.7 @@ -2296,7 +2296,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.7-7 + version: $progname $scriptversion Debian-2.4.7-8 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff --git a/configure b/configure index caea6f49..6778924e 100755 --- a/configure +++ b/configure @@ -685,9 +685,11 @@ BUILD_PORTMIDI_TRUE BUILD_DOCS_FALSE BUILD_DOCS_TRUE ICON_NAME +CONFIG_DIR_NAME CONFIG_NAME CLIENT_NAME APP_BUILD_OS +APP_BUILD_ISSUE APP_ENGINE APP_TYPE APP_NAME @@ -882,6 +884,7 @@ with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock +with_client enable_docs enable_jack enable_jack_session @@ -1598,6 +1601,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --with-client Change name of client/port from default --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional) --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional) @@ -5616,6 +5620,17 @@ ac_build_testing="no" ac_build_qt="yes" +ac_app_name="qseq66" +ac_app_type="qt" +ac_app_engine="rtmidi" +ac_app_build_issue="Linux" +ac_app_build_os="Linux" +ac_client_name="seq66" +ac_config_name="qseq66" +ac_config_dir_name="seq66" +ac_icon_name="qseq66" + + case $host_os in *cygwin* | *msys* | windows*) ac_build_windows="yes";; * ) ac_build_windows="no";; @@ -5642,21 +5657,7 @@ printf "%s\n" "#define APP_TYPE \"qt5\"" >>confdefs.h printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h -ac_build_os="'$(uname -srm)'" - - - -printf "%s\n" "#define APP_BUILD_OS \"$ac_build_os\"" >>confdefs.h - - - - -printf "%s\n" "#define APP_BUILD_ISSUE \"GNU/Linux\"" >>confdefs.h - - - -printf "%s\n" "#define CLIENT_NAME \"seq66\"" >>confdefs.h - +ac_app_build_os="'$(uname -srm)'" SEQ66_SUITE_NAME="SEQ66" @@ -17341,6 +17342,19 @@ seq66pixdir="${datadir}/pixmaps/seq66-${SEQ66_API_VERSION}" + +# Check whether --with-client was given. +if test ${with_client+y} +then : + withval=$with_client; ac_client_name=$withval +fi + + + +printf "%s\n" "#define CLIENT_NAME \"$ac_client_name\"" >>confdefs.h + + + CFLAGS="${CFLAGS} -I/usr/local/include " CXXFLAGS="${CXXFLAGS} -I/usr/local/include " LDFLAGS="${LDFLAGS} -L/usr/local/lib " @@ -18668,18 +18682,6 @@ fi if test "$rtmidi" != "no" -o "$both" != "no" ; then ac_build_rtmidi="yes" -printf "%s\n" "#define APP_NAME \"qseq66\"" >>confdefs.h - - -printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h - - -printf "%s\n" "#define CONFIG_NAME \"qseq66\"" >>confdefs.h - - -printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h - - printf "%s\n" "#define RTMIDI_SUPPORT 1" >>confdefs.h alsa_save_CFLAGS="$CFLAGS" @@ -19167,23 +19169,11 @@ if test "$cli" != "no" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: rtmidi command-line build enabled" >&5 printf "%s\n" "rtmidi command-line build enabled" >&6; }; -printf "%s\n" "#define APP_NAME \"seq66cli\"" >>confdefs.h - - printf "%s\n" "#define APP_CLI 1" >>confdefs.h - -printf "%s\n" "#define APP_TYPE \"cli\"" >>confdefs.h - - -printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h - - -printf "%s\n" "#define CONFIG_NAME \"seq66cli\"" >>confdefs.h - - -printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h - + ac_app_name="seq66cli" + ac_app_type="cli" + ac_config_name="seq66cli" if test "$mingw" != "yes" ; then ac_build_rtcli="yes" ac_build_qtmidi="no" @@ -19673,21 +19663,8 @@ fi if test "$ac_build_qt" != "no" ; then - -printf "%s\n" "#define APP_NAME \"qseq66\"" >>confdefs.h - - -printf "%s\n" "#define APP_ENGINE \"rtmidi\"" >>confdefs.h - - -printf "%s\n" "#define APP_TYPE \"qt5\"" >>confdefs.h - - -printf "%s\n" "#define CONFIG_NAME \"qseq66\"" >>confdefs.h - - -printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h - + ac_app_name="qseq66" + ac_app_type="qt" if test "$ac_build_windows" != "yes" ; then alsa_save_CFLAGS="$CFLAGS" alsa_save_LDFLAGS="$LDFLAGS" @@ -21716,17 +21693,11 @@ fi if test "$portmidi" != "no" ; then ac_build_portmidi="yes" ac_build_rtmidi="no" + ac_app_name="seq66portmidi" + ac_config_name="seq66portmidi" -printf "%s\n" "#define PORTMIDI_SUPPORT 1" >>confdefs.h - - -printf "%s\n" "#define APP_NAME \"seq66portmidi\"" >>confdefs.h - -printf "%s\n" "#define CONFIG_NAME \"seq66portmidi\"" >>confdefs.h - - -printf "%s\n" "#define ICON_NAME \"qseq66\"" >>confdefs.h +printf "%s\n" "#define PORTMIDI_SUPPORT 1" >>confdefs.h alsa_save_CFLAGS="$CFLAGS" alsa_save_LDFLAGS="$LDFLAGS" @@ -22200,6 +22171,36 @@ printf "%s\n" "$as_me: Portmidi build disabled" >&6;}; fi +printf "%s\n" "#define APP_NAME \"$ac_app_name\"" >>confdefs.h + + +printf "%s\n" "#define APP_TYPE \"$ac_app_type\"" >>confdefs.h + + +printf "%s\n" "#define APP_ENGINE \"$ac_app_engine\"" >>confdefs.h + + +printf "%s\n" "#define APP_BUILD_ISSUE \"GNU/Linux\"" >>confdefs.h + + +printf "%s\n" "#define APP_BUILD_OS \"$ac_app_build_os\"" >>confdefs.h + + +printf "%s\n" "#define CLIENT_NAME \"$ac_client_name\"" >>confdefs.h + + +printf "%s\n" "#define CONFIG_NAME \"$ac_config_name\"" >>confdefs.h + + +printf "%s\n" "#define CONFIG_DIR_NAME \"$ac_config_dir_name\"" >>confdefs.h + + +printf "%s\n" "#define ICON_NAME \"$ac_icon_name\"" >>confdefs.h + + + + + diff --git a/configure.ac b/configure.ac index 36469829..afbb67b9 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl \file configure.ac dnl \library Seq66 dnl \author Chris Ahlstrom dnl \date 2018-11-09 -dnl \update 2024-10-28 +dnl \update 2024-11-04 dnl \version $Revision$ dnl \license $XPC_SUITE_GPL_LICENSE$ dnl @@ -99,6 +99,18 @@ ac_build_sessions="yes" ac_build_testing="no" ac_build_qt="yes" +dnl The default names describing aspects of the application. + +ac_app_name="qseq66" +ac_app_type="qt" +ac_app_engine="rtmidi" +ac_app_build_issue="Linux" +ac_app_build_os="Linux" +ac_client_name="seq66" +ac_config_name="qseq66" +ac_config_dir_name="seq66" +ac_icon_name="qseq66" + dnl Test for CYGWIN/MSYS2; this macro is marked as obsolete, though: dnl AC_CYGWIN. Instead, see AC_CANONICAL_HOST at the top of this file. dnl It uses the host_os variable. @@ -129,32 +141,7 @@ AC_SUBST([PACKAGE]) AC_DEFINE(APP_TYPE, ["qt5"], "Type of the Seq66 executable, qt/cli") AC_DEFINE(APP_ENGINE, ["rtmidi"], "Seq66 MIDI engine, rtmidi/portmidi") -ac_build_os="'$(uname -srm)'" - -dnl Get the value of /etc/issue.net and remove new lines. Note that -dnl the CLIENT_NAME macro is always "seq66" and is used as part of -dnl the installation sub-directories. -dnl -dnl Is there a way to do this for FreeBSD??? For now see seq66_features.cpp. - -AC_DEFINE_UNQUOTED( - APP_BUILD_OS, - ["$ac_build_os"], - "OS/kernel where build was done") - -dnl AC_DEFINE_UNQUOTED( -dnl APP_BUILD_ISSUE, -dnl "[m4_normalize(esyscmd([cat /etc/issue.net]))]", -dnl "Distro of build") -dnl -dnl Let's try a more universal method. - -AC_DEFINE_UNQUOTED( - APP_BUILD_ISSUE, - "[m4_normalize(esyscmd([uname -o]))]", - "Operating system of build") - -AC_DEFINE(CLIENT_NAME, ["seq66"], "Name to display as client/port") +ac_app_build_os="'$(uname -srm)'" SEQ66_SUITE_NAME="SEQ66" AC_SUBST([SEQ66_SUITE_NAME]) @@ -245,6 +232,15 @@ AC_SUBST(seq66datadir) seq66pixdir="${datadir}/pixmaps/seq66-${SEQ66_API_VERSION}" AC_SUBST(seq66pixdir) +dnl Allow the user to change client/port name. + +AC_ARG_WITH(client, + [AS_HELP_STRING(--with-client, [Change name of client/port from default])], + [ac_client_name=$withval], + []) + +AC_DEFINE_UNQUOTED(CLIENT_NAME, ["$ac_client_name"], "Name of client/port") + dnl 4. Get external flags, if any. CFLAGS="${CFLAGS} -I/usr/local/include " @@ -450,10 +446,6 @@ if test "$ac_build_windows" = "no" ; then if test "$rtmidi" != "no" -o "$both" != "no" ; then ac_build_rtmidi="yes" - AC_DEFINE(APP_NAME, ["qseq66"], [Names the JACK/ALSA version of application]) - AC_DEFINE(APP_ENGINE, ["rtmidi"], [Names the MIDI engine of the application]) - AC_DEFINE(CONFIG_NAME, ["qseq66"], [Configuration file name]) - AC_DEFINE(ICON_NAME, ["qseq66"], [Canonical icon name for Freedesktop]) AC_DEFINE(RTMIDI_SUPPORT, 1, [Indicates the rtmidi engine is enabled]) AM_PATH_ALSA(0.9.0) AC_MSG_RESULT([rtmidi engine build enabled]); @@ -470,12 +462,10 @@ AC_ARG_ENABLE(cli, if test "$cli" != "no" ; then AC_MSG_RESULT([rtmidi command-line build enabled]); - AC_DEFINE(APP_NAME, ["seq66cli"], [Name of the CLI version of application]) AC_DEFINE(APP_CLI, [1], [Indicate the CLI version]) - AC_DEFINE(APP_TYPE, ["cli"], [Name of the UI]) - AC_DEFINE(APP_ENGINE, ["rtmidi"], [Name of the MIDI engine]) - AC_DEFINE(CONFIG_NAME, ["seq66cli"], [Configuration file name]) - AC_DEFINE(ICON_NAME, ["qseq66"], [Canonical icon name for Freedesktop]) + ac_app_name="seq66cli" + ac_app_type="cli" + ac_config_name="seq66cli" if test "$mingw" != "yes" ; then ac_build_rtcli="yes" ac_build_qtmidi="no" @@ -499,11 +489,8 @@ dnl Will set the default to yes later. Will need to distinguish between rtmidi dnl and portmidi builds. if test "$ac_build_qt" != "no" ; then - AC_DEFINE(APP_NAME, ["qseq66"], [Name of the Qt/rtmidi application]) - AC_DEFINE(APP_ENGINE, ["rtmidi"], [Name of the MIDI engine]) - AC_DEFINE(APP_TYPE, ["qt5"], [Name of the UI of the application]) - AC_DEFINE(CONFIG_NAME, ["qseq66"], [Configuration base file name]) - AC_DEFINE(ICON_NAME, ["qseq66"], [Canonical icon name for Freedesktop]) + ac_app_name="qseq66" + ac_app_type="qt" if test "$ac_build_windows" != "yes" ; then AM_PATH_ALSA(0.9.0) fi @@ -531,22 +518,36 @@ AC_ARG_ENABLE(portmidi, if test "$portmidi" != "no" ; then ac_build_portmidi="yes" ac_build_rtmidi="no" + ac_app_name="seq66portmidi" + ac_config_name="seq66portmidi" + AC_DEFINE(PORTMIDI_SUPPORT, 1, [Indicates if portmidi is enabled]) - AC_DEFINE(APP_NAME, ["seq66portmidi"], [Name of this application]) - AC_DEFINE(CONFIG_NAME, ["seq66portmidi"], [Configuration file name]) - AC_DEFINE(ICON_NAME, ["qseq66"], [Canonical icon name for Freedesktop]) AM_PATH_ALSA(0.9.0) AC_MSG_RESULT([Portmidi build enabled]); else AC_MSG_NOTICE([Portmidi build disabled]); fi +AC_DEFINE_UNQUOTED(APP_NAME, ["$ac_app_name"], [Name of the CLI application]) +AC_DEFINE_UNQUOTED(APP_TYPE, ["$ac_app_type"], [Name of the GUI/UI]) +AC_DEFINE_UNQUOTED(APP_ENGINE, ["$ac_app_engine"], [Name of the MIDI engine]) +AC_DEFINE_UNQUOTED(APP_BUILD_ISSUE, "[m4_normalize(esyscmd([uname -o]))]", + [Operating system of build]) +AC_DEFINE_UNQUOTED(APP_BUILD_OS, ["$ac_app_build_os"], [OS/kernel of build]) +AC_DEFINE_UNQUOTED(CLIENT_NAME, ["$ac_client_name"], [Client/port base name]) +AC_DEFINE_UNQUOTED(CONFIG_NAME, ["$ac_config_name"], [Configuration base file name]) +AC_DEFINE_UNQUOTED(CONFIG_DIR_NAME, ["$ac_config_dir_name"], + [Configuration sub-directory]) +AC_DEFINE_UNQUOTED(ICON_NAME, ["$ac_icon_name"], [Icon name for Freedesktop]) + AC_SUBST(APP_NAME) AC_SUBST(APP_TYPE) AC_SUBST(APP_ENGINE) +AC_SUBST(APP_BUILD_ISSUE) AC_SUBST(APP_BUILD_OS) AC_SUBST(CLIENT_NAME) AC_SUBST(CONFIG_NAME) +AC_SUBST(CONFIG_DIR_NAME) AC_SUBST(ICON_NAME) AM_CONDITIONAL([BUILD_DOCS], [test "$ac_build_docs" = "yes"]) @@ -562,7 +563,7 @@ dnl macros automatically. AH_TOP( -#define VERSION_DATE_SHORT "2024-10-31" +#define VERSION_DATE_SHORT "2024-11-04" #define API_VERSION "0.99" #define VERSION "0.99.16" diff --git a/data/Makefile.in b/data/Makefile.in index b3ed3eb2..567c9026 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -159,6 +159,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -172,6 +173,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 9e517f87..48f51e57 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -215,6 +215,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -228,6 +229,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/doc/latex/Makefile.in b/doc/latex/Makefile.in index ecbaab2d..7514012c 100644 --- a/doc/latex/Makefile.in +++ b/doc/latex/Makefile.in @@ -213,6 +213,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -226,6 +227,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/doc/latex/tex/Makefile.in b/doc/latex/tex/Makefile.in index 3be0b0fc..509e0622 100644 --- a/doc/latex/tex/Makefile.in +++ b/doc/latex/tex/Makefile.in @@ -157,6 +157,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -170,6 +171,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/include/cli/seq66-config.h b/include/cli/seq66-config.h index 7fce5598..92b755d8 100644 --- a/include/cli/seq66-config.h +++ b/include/cli/seq66-config.h @@ -6,14 +6,12 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ #ifndef SEQ66_VERSION_DATE_SHORT -#define SEQ66_VERSION_DATE_SHORT "2024-10-19" +#define SEQ66_VERSION_DATE_SHORT "2024-11-04" #endif #ifndef SEQ66_VERSION -#define SEQ66_VERSION "0.99.15" +#define SEQ66_VERSION "0.99.16" #endif - - /* "Distro of build" */ #ifndef SEQ66_APP_BUILD_ISSUE #define SEQ66_APP_BUILD_ISSUE "Ubuntu 20.04.4 LTS" @@ -49,6 +47,11 @@ #define SEQ66_CLIENT_NAME "seq66" #endif +/* Configuration sub-directory */ +#ifndef SEQ66_CONFIG_DIR_NAME +#define SEQ66_CONFIG_DIR_NAME "seq66" +#endif + /* Configuration file name */ #ifndef SEQ66_CONFIG_NAME #define SEQ66_CONFIG_NAME "seq66cli" @@ -255,7 +258,7 @@ /* Define to the full name and version of this package. */ #ifndef SEQ66_PACKAGE_STRING -#define SEQ66_PACKAGE_STRING "Seq66 0.99.15" +#define SEQ66_PACKAGE_STRING "Seq66 0.99.16" #endif /* Define to the one symbol short name of this package. */ @@ -270,7 +273,7 @@ /* Define to the version of this package. */ #ifndef SEQ66_PACKAGE_VERSION -#define SEQ66_PACKAGE_VERSION "0.99.15" +#define SEQ66_PACKAGE_VERSION "0.99.16" #endif /* Indicates if portmidi is enabled */ @@ -297,7 +300,7 @@ /* Version number of package */ #ifndef SEQ66_VERSION -#define SEQ66_VERSION "0.99.15" +#define SEQ66_VERSION "0.99.16" #endif /* Define to 1 if the X Window System is missing or not being used. */ diff --git a/include/config.h.in b/include/config.h.in index 8d61d3a8..7605c5ba 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,6 +1,6 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ -#define VERSION_DATE_SHORT "2024-10-31" +#define VERSION_DATE_SHORT "2024-11-04" #define API_VERSION "0.99" #define VERSION "0.99.16" @@ -9,10 +9,10 @@ /* Seq66 API version */ #undef API_VERSION -/* "Operating system of build" */ +/* Operating system of build */ #undef APP_BUILD_ISSUE -/* "OS/kernel where build was done" */ +/* OS/kernel of build */ #undef APP_BUILD_OS /* Indicate the CLI version */ @@ -21,19 +21,22 @@ /* Name of the MIDI engine */ #undef APP_ENGINE -/* Name of this application */ +/* Name of the CLI application */ #undef APP_NAME -/* Name of the UI of the application */ +/* Name of the GUI/UI */ #undef APP_TYPE /* Define if clang is active */ #undef CLANG_SUPPORT -/* "Name to display as client/port" */ +/* Client/port base name */ #undef CLIENT_NAME -/* Configuration file name */ +/* Configuration sub-directory */ +#undef CONFIG_DIR_NAME + +/* Configuration base file name */ #undef CONFIG_NAME /* Define COVFLAGS=-fprofile-arcs -ftest-coverage if coverage support is @@ -121,7 +124,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Canonical icon name for Freedesktop */ +/* Icon name for Freedesktop */ #undef ICON_NAME /* Enable JACK version string */ diff --git a/include/qt/portmidi/seq66-config.h b/include/qt/portmidi/seq66-config.h index c7c38c41..fbbd187b 100644 --- a/include/qt/portmidi/seq66-config.h +++ b/include/qt/portmidi/seq66-config.h @@ -33,7 +33,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2018-11-10 - * \updates 2024-10-19 + * \updates 2024-11-04 * \license GNU GPLv2 or above * * Qt Portmidi Linux and Windows versions, hardwired for use with @@ -62,7 +62,7 @@ #endif #if ! defined SEQ66_VERSION_DATE_SHORT -#define SEQ66_VERSION_DATE_SHORT "2024-10-31" +#define SEQ66_VERSION_DATE_SHORT "2024-11-04" #endif #if ! defined SEQ66_API_VERSION @@ -133,6 +133,14 @@ #define SEQ66_CLIENT_NAME "seq66" #endif +/* + * Configuration sub-directory + */ + +#ifndef SEQ66_CONFIG_DIR_NAME +#define SEQ66_CONFIG_DIR_NAME "seq66" +#endif + /* * The LIBLO library is unavailable on Windows. Don't know about Mac! */ diff --git a/include/qt/rtmidi/seq66-config.h b/include/qt/rtmidi/seq66-config.h index 95205031..f2d2a047 100644 --- a/include/qt/rtmidi/seq66-config.h +++ b/include/qt/rtmidi/seq66-config.h @@ -33,7 +33,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2020-05-31 - * \updates 2024-10-31 + * \updates 2024-11-04 * \license GNU GPLv2 or above * * Qt Rtmidi Linux and Windows versions, hardwired for use with @@ -70,7 +70,7 @@ #endif #if ! defined SEQ66_VERSION_DATE_SHORT -#define SEQ66_VERSION_DATE_SHORT "2024-10-31" +#define SEQ66_VERSION_DATE_SHORT "2024-11-04" #endif #if ! defined SEQ66_API_VERSION @@ -141,6 +141,14 @@ #define SEQ66_CLIENT_NAME "seq66" #endif +/* + * Configuration sub-directory + */ + +#ifndef SEQ66_CONFIG_DIR_NAME +#define SEQ66_CONFIG_DIR_NAME "seq66" +#endif + /* * Define if LIBLO library is available. If you get an error, either undefine * this value or install the liblo-dev package. diff --git a/libseq66/Makefile.in b/libseq66/Makefile.in index 85c4e6b9..2158f5d8 100644 --- a/libseq66/Makefile.in +++ b/libseq66/Makefile.in @@ -221,6 +221,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -234,6 +235,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/libseq66/include/Makefile.in b/libseq66/include/Makefile.in index c5bf35e3..00328974 100644 --- a/libseq66/include/Makefile.in +++ b/libseq66/include/Makefile.in @@ -203,6 +203,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -216,6 +217,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/libseq66/include/seq66_features.hpp b/libseq66/include/seq66_features.hpp index d9de0173..e26df742 100644 --- a/libseq66/include/seq66_features.hpp +++ b/libseq66/include/seq66_features.hpp @@ -28,7 +28,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2018-11-24 - * \updates 2023-10-28 + * \updates 2023-11-04 * \license GNU GPLv2 or above * * Provides some useful functions for displaying information about the @@ -119,6 +119,7 @@ extern const std::string & seq_arg_0 (); extern const std::string & seq_client_name (); extern const std::string & seq_client_short (); extern const std::string & seq_config_name (); +extern const std::string & seq_config_dir_name (); extern const std::string & seq_icon_name (); extern bool is_a_tty (int fd); extern std::string seq_client_tag (msglevel el = msglevel::none); diff --git a/libseq66/src/Makefile.in b/libseq66/src/Makefile.in index fee58ab2..d2d70099 100644 --- a/libseq66/src/Makefile.in +++ b/libseq66/src/Makefile.in @@ -312,6 +312,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -325,6 +326,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/libseq66/src/cfg/rcsettings.cpp b/libseq66/src/cfg/rcsettings.cpp index f182d0eb..3000a2e0 100644 --- a/libseq66/src/cfg/rcsettings.cpp +++ b/libseq66/src/cfg/rcsettings.cpp @@ -25,7 +25,7 @@ * \library seq66 application * \author Seq24 team; modifications by Chris Ahlstrom * \date 2015-09-22 - * \updates 2023-12-10 + * \updates 2024-11-04 * \license GNU GPLv2 or above * * Note that this module also sets the legacy global variables, so that @@ -144,7 +144,7 @@ rcsettings::rcsettings () : m_portmaps_present (false), m_portmaps_active (false) { - m_session_directory = user_session(seq_client_name()); + m_session_directory = user_session(seq_config_dir_name()); m_midi_control_in.inactive_allowed(true); m_config_filename += ".rc"; m_user_filename += ".usr"; @@ -232,7 +232,7 @@ rcsettings::set_defaults () m_jack_session_uuid.clear(); m_jack_session_active = false; m_last_used_dir.clear(); /* double_quotes() */ - m_session_directory = user_session(seq_client_name()); + m_session_directory = user_session(seq_config_dir_name()); m_config_subdirectory_set = false; m_config_subdirectory.clear(); m_config_filename = seq_config_name(); diff --git a/libseq66/src/seq66_features.cpp b/libseq66/src/seq66_features.cpp index 544b6dc3..20d7f4a8 100644 --- a/libseq66/src/seq66_features.cpp +++ b/libseq66/src/seq66_features.cpp @@ -25,7 +25,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2017-03-12 - * \updates 2023-12-18 + * \updates 2024-11-04 * \license GNU GPLv2 or above * * The first part of this file defines a couple of global structure @@ -331,6 +331,13 @@ seq_config_name () return s_config_name; } +const std::string & +seq_config_dir_name () +{ + static std::string s_config_dir_name = SEQ66_CONFIG_DIR_NAME; + return s_config_dir_name; +} + const std::string & seq_icon_name () { @@ -489,7 +496,7 @@ seq_api_subdirectory () if (s_uninitialized) { s_uninitialized = false; - s_subdirectory = SEQ66_CLIENT_NAME; /* constant */ + s_subdirectory = SEQ66_CONFIG_DIR_NAME; /* constant */ s_subdirectory += "-"; s_subdirectory += seq_api_version(); } diff --git a/libsessions/Makefile.in b/libsessions/Makefile.in index 70bbb973..d856dd5f 100644 --- a/libsessions/Makefile.in +++ b/libsessions/Makefile.in @@ -221,6 +221,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -234,6 +235,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/libsessions/include/Makefile.in b/libsessions/include/Makefile.in index e76db2b4..f8ccadc5 100644 --- a/libsessions/include/Makefile.in +++ b/libsessions/include/Makefile.in @@ -203,6 +203,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -216,6 +217,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/libsessions/src/Makefile.in b/libsessions/src/Makefile.in index 41e67452..0cb4e047 100644 --- a/libsessions/src/Makefile.in +++ b/libsessions/src/Makefile.in @@ -243,6 +243,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -256,6 +257,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/m4/Makefile.in b/m4/Makefile.in index b35a0d2e..ac8de551 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -153,6 +153,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -166,6 +167,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/man/Makefile.in b/man/Makefile.in index e384ed99..bdf19108 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -183,6 +183,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -196,6 +197,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/resources/pixmaps/Makefile.in b/resources/pixmaps/Makefile.in index f684bd03..c457b8ad 100644 --- a/resources/pixmaps/Makefile.in +++ b/resources/pixmaps/Makefile.in @@ -182,6 +182,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -195,6 +196,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_portmidi/Makefile.in b/seq_portmidi/Makefile.in index 4b345a6e..7341eba1 100644 --- a/seq_portmidi/Makefile.in +++ b/seq_portmidi/Makefile.in @@ -221,6 +221,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -234,6 +235,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_portmidi/include/Makefile.in b/seq_portmidi/include/Makefile.in index fb7ccbf1..a326f792 100644 --- a/seq_portmidi/include/Makefile.in +++ b/seq_portmidi/include/Makefile.in @@ -203,6 +203,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -216,6 +217,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_portmidi/src/Makefile.in b/seq_portmidi/src/Makefile.in index 470a0d47..df53c42e 100644 --- a/seq_portmidi/src/Makefile.in +++ b/seq_portmidi/src/Makefile.in @@ -263,6 +263,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -276,6 +277,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_qt5/Makefile.in b/seq_qt5/Makefile.in index 515709a1..aae60692 100644 --- a/seq_qt5/Makefile.in +++ b/seq_qt5/Makefile.in @@ -221,6 +221,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -234,6 +235,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_qt5/forms/Makefile.in b/seq_qt5/forms/Makefile.in index 29e1479c..e8061619 100644 --- a/seq_qt5/forms/Makefile.in +++ b/seq_qt5/forms/Makefile.in @@ -156,6 +156,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -169,6 +170,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_qt5/include/Makefile.in b/seq_qt5/include/Makefile.in index 065eed08..e57a67de 100644 --- a/seq_qt5/include/Makefile.in +++ b/seq_qt5/include/Makefile.in @@ -207,6 +207,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -220,6 +221,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_qt5/src/Makefile.in b/seq_qt5/src/Makefile.in index c69029aa..f17ed88a 100644 --- a/seq_qt5/src/Makefile.in +++ b/seq_qt5/src/Makefile.in @@ -328,6 +328,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -341,6 +342,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_rtmidi/Makefile.in b/seq_rtmidi/Makefile.in index b81c3bce..8e136255 100644 --- a/seq_rtmidi/Makefile.in +++ b/seq_rtmidi/Makefile.in @@ -221,6 +221,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -234,6 +235,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_rtmidi/include/Makefile.in b/seq_rtmidi/include/Makefile.in index 0b48b42e..9722c3a6 100644 --- a/seq_rtmidi/include/Makefile.in +++ b/seq_rtmidi/include/Makefile.in @@ -203,6 +203,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -216,6 +217,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@ diff --git a/seq_rtmidi/src/Makefile.in b/seq_rtmidi/src/Makefile.in index 24b22e5a..f1d3191d 100644 --- a/seq_rtmidi/src/Makefile.in +++ b/seq_rtmidi/src/Makefile.in @@ -248,6 +248,7 @@ ALSA_TOPOLOGY_LIBS = @ALSA_TOPOLOGY_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ API_VERSION = @API_VERSION@ +APP_BUILD_ISSUE = @APP_BUILD_ISSUE@ APP_BUILD_OS = @APP_BUILD_OS@ APP_ENGINE = @APP_ENGINE@ APP_NAME = @APP_NAME@ @@ -261,6 +262,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_NAME = @CLIENT_NAME@ +CONFIG_DIR_NAME = @CONFIG_DIR_NAME@ CONFIG_NAME = @CONFIG_NAME@ COVFLAGS = @COVFLAGS@ CPP = @CPP@