From 4b8f1cd4298b59930e93ba13b03ebb61e9813b76 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sun, 4 Aug 2019 15:45:58 -0700
Subject: [PATCH] Plugin builds: Add adapter.c to _shim_la_SOURCES, not
 _LIBADD.

---
 src/blowfish/Makefile.am | 5 +++--
 src/gdbm/Makefile.am     | 5 +++--
 src/mcrypt/Makefile.am   | 5 +++--
 src/x11/Makefile.am      | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index e5126c1eb..e09a52af6 100644
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -48,7 +48,8 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = @MIT_CFLAGS@
 
-blowfish_shim_la_LIBADD = blowfish-adapter.lo
+blowfish_shim_la_SOURCES = blowfish-adapter.c blowfish-shim.h
+nodist_blowfish_shim_la_SOURCES = blowfish-shim.c
 blowfish_shim_la_LDFLAGS = -module -avoid-version -shared
 
 noinst_PROGRAMS = blowfish-const$(EXEEXT)
@@ -92,7 +93,7 @@ tags: tags-am
 
 TAGS_FILES = $(sources) blowfish-adapter.c $(cdecls)
 
-EXTRA_DIST += $(sources) blowfish-adapter.c $(cdecls)
+EXTRA_DIST += $(sources) $(cdecls)
 EXTRA_DIST += compile.sh compile.scm blowfish.pkg
 EXTRA_DIST += blowfish-test.scm blowfish-check.scm blowfish-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am
index 9d597bf1a..b7cc901cf 100644
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -48,7 +48,8 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = @MIT_CFLAGS@
 
-gdbm_shim_la_LIBADD = gdbm-adapter.lo
+gdbm_shim_la_SOURCES = gdbm-adapter.c gdbm-shim.h
+nodist_gdbm_shim_la_SOURCES = gdbm-shim.c
 gdbm_shim_la_LDFLAGS = -module -avoid-version -shared
 
 noinst_PROGRAMS = gdbm-const$(EXEEXT)
@@ -92,7 +93,7 @@ tags: tags-am
 
 TAGS_FILES = $(sources) gdbm-adapter.c $(cdecls)
 
-EXTRA_DIST += $(sources) gdbm-adapter.c $(cdecls)
+EXTRA_DIST += $(sources) $(cdecls)
 EXTRA_DIST += compile.sh compile.scm gdbm.pkg
 EXTRA_DIST += gdbm-check.scm gdbm-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
diff --git a/src/mcrypt/Makefile.am b/src/mcrypt/Makefile.am
index 4f3c8ea2d..5e097d0ea 100644
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@ -48,7 +48,8 @@ scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = @MIT_CFLAGS@
 
-mcrypt_shim_la_LIBADD = mcrypt-adapter.lo
+mcrypt_shim_la_SOURCES = mcrypt-adapter.c mcrypt-shim.h
+nodist_mcrypt_shim_la_SOURCES = mcrypt-shim.c
 mcrypt_shim_la_LDFLAGS = -module -avoid-version -shared
 
 noinst_PROGRAMS = mcrypt-const$(EXEEXT)
@@ -92,7 +93,7 @@ tags: tags-am
 
 TAGS_FILES = $(sources) mcrypt-adapter.c $(cdecls)
 
-EXTRA_DIST += $(sources) mcrypt-adapter.c $(cdecls)
+EXTRA_DIST += $(sources) $(cdecls)
 EXTRA_DIST += compile.sh compile.scm mcrypt.pkg
 EXTRA_DIST += mcrypt-check.scm mcrypt-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am
index deb175d69..b1019cf24 100644
--- a/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@ -48,10 +48,10 @@ scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@
 AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = @MIT_CFLAGS@
 
-x11_shim_la_LIBADD = @MIT_LIBS@
-c_sources = x11base.c x11color.c x11graph.c x11term.c x11-shim.h x11.h
-x11_shim_la_SOURCES = $(c_sources) x11-shim.c
+x11_shim_la_SOURCES = x11base.c x11color.c x11graph.c x11term.c x11-shim.h x11.h
+nodist_x11_shim_la_SOURCES = x11-shim.c
 x11_shim_la_LDFLAGS = -module -avoid-version -shared
+x11_shim_la_LIBADD = @MIT_LIBS@
 
 noinst_PROGRAMS = x11-const$(EXEEXT)
 x11_const_SOURCES = x11-shim.h x11.h
-- 
2.25.1