From 5a7c1a32ba17283ad529015f97c73c3a62942ec2 Mon Sep 17 00:00:00 2001
From: Michael Herstine <michael@lithic>
Date: Sun, 17 Sep 2023 06:47:52 -0400
Subject: [PATCH] Fix CI-- LDFLAGS

---
 .github/workflows/ci.yml |  6 +++---
 scribbu/Makefile.am      | 31 ++++++++++++++-----------------
 src/Makefile.am          |  4 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 79466d9..30ac125 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -304,9 +304,9 @@ jobs:
         eval "$(/usr/libexec/path_helper)"
         PATH="/usr/local/opt/bison/bin:/usr/local/opt/texinfo/bin:$PATH" ./configure --with-boost=$(cd boost_${{ matrix.boost-ver }}/installdir; pwd) --with-openssl=/usr/local/opt/openssl CPPFLAGS="-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR -I/usr/local/opt/openssl@1.1/include" LDFLAGS="-L/usr/local/opt/openssl@1.1/lib"
 
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
-      if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'oldest'
+    # - name: Setup tmate session
+    #   uses: mxschmitt/action-tmate@v3
+    #   if: matrix.os == 'ubuntu-22.04' && matrix.boost == 'oldest'
 
     - name: Make scribbu (Ubuntu)
       if: matrix.os == 'ubuntu-22.04'
diff --git a/scribbu/Makefile.am b/scribbu/Makefile.am
index 5ef008d..cdc5220 100644
--- a/scribbu/Makefile.am
+++ b/scribbu/Makefile.am
@@ -1,22 +1,6 @@
 # Tell automake that these two must be built first; we say how below
 BUILT_SOURCES = tbt-parser.hh tbt-lexer.hh scheme.x
-
-AM_YFLAGS = -d
-AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_CPPFLAGS) $(OPENSSL_INCLUDES) $(GUILE_CFLAGS)
-AM_CXXFLAGS = -std=c++17 -Wno-register $(GUILE_CFLAGS)
-AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBUNISTRING)
-
 lib_LTLIBRARIES = libscribbu.la
-libscribbu_la_LIBADD = $(GUILE_LIBS)	 \
-	$(OPENSSL_LIBS)                  \
-	$(BOOST_IOSTREAMS_LIB)           \
-	$(BOOST_FILESYSTEM_LIB)          \
-	$(BOOST_LOG_LIB)                 \
-	$(BOOST_PROGRAM_OPTIONS_LIB)     \
-	$(BOOST_REGEX_LIB)               \
-	$(BOOST_SYSTEM_LIB)
-
-
 libscribbu_la_SOURCES = tbt-parser.yy		\
 			tbt-lexer.ll		\
 			scribbu.cc		\
@@ -68,7 +52,20 @@ pkginclude_HEADERS = scribbu.hh		\
 		     scheme-serde.hh    \
 		     winamp-genres.hh
 
-libscribbu_la_LDFLAGS = -version-info 4:1:0
+AM_YFLAGS = -d
+AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_CPPFLAGS) $(OPENSSL_INCLUDES) $(GUILE_CFLAGS)
+AM_CXXFLAGS = -std=c++17 -Wno-register $(GUILE_CFLAGS)
+AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBUNISTRING)
+
+libscribbu_la_LIBADD = $(GUILE_LIBS)	 \
+	$(OPENSSL_LIBS)                  \
+	$(BOOST_IOSTREAMS_LIB)           \
+	$(BOOST_FILESYSTEM_LIB)          \
+	$(BOOST_LOG_LIB)                 \
+	$(BOOST_REGEX_LIB)               \
+	$(BOOST_SYSTEM_LIB)
+
+libscribbu_la_LDFLAGS = -version-info 4:1:0 $(BOOST_LDFLAGS) $(LIBUNISTRING)
 
 # automake will figure out how to make tbt-parser.hh, but we need to tell it how 
 # to make tbt-lexer.h:
diff --git a/src/Makefile.am b/src/Makefile.am
index 50d860a..0f1f92f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@ bin_PROGRAMS = scribbu
 scribbu_SOURCES = scribbu.cc command-utilities.hh command-utilities.cc \
 	rename.cc report.cc split.cc dump.cc popm.cc xtag.cc text.cc   \
         genre.cc m3u.cc encodings.cc
-# AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_CPPFLAGS) $(GUILE_CFLAGS) -DDATADIR=\"$(datadir)\" -DSCRIBBU_ALWAYS_DUMP_CORE
-AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_CPPFLAGS) $(GUILE_CFLAGS) -DDATADIR=\"$(datadir)\"
+AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_CPPFLAGS) $(GUILE_CFLAGS) -DDATADIR=\"$(datadir)\" -DSCRIBBU_ALWAYS_DUMP_CORE
+# AM_CPPFLAGS = -I$(srcdir)/.. $(BOOST_CPPFLAGS) $(GUILE_CFLAGS) -DDATADIR=\"$(datadir)\"
 AM_CXXFLAGS = -std=c++17 $(GUILE_CFLAGS)
 AM_LDFLAGS  = $(BOOST_LDFLAGS) $(LIBUNISTRING)
 scribbu_LDADD = ../scribbu/libscribbu.la \