From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Thu, 25 Jul 2019 20:32:23 +0000 (-0500)
Subject: Merge branch 'master' into pucked.
X-Git-Tag: mit-scheme-pucked-10.1.12~7
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c9802522553eb3ad9df3b2db78738aaebc5291f2;p=mit-scheme.git

Merge branch 'master' into pucked.
---

c9802522553eb3ad9df3b2db78738aaebc5291f2
diff --cc doc/make-common.in
index f17214fc9,bcf004cc2..26dc5e0b4
--- a/doc/make-common.in
+++ b/doc/make-common.in
@@@ -74,24 -75,29 +74,31 @@@ DVI_TARGET = $(TARGET_ROOT).dv
  PDF_TARGET = $(TARGET_ROOT).pdf
  PS_TARGET = $(TARGET_ROOT).ps
  
+ GS = gs
+ PS2PDF = ps2pdf
+ PS2PNG = $(GS) -dSAFER -dBATCH -dNOPAUSE -sDEVICE=png16m
+ 
  TEX_OPTIONS = --quiet $(EXTRA_TEX_OPTIONS)
  
+ FIGURES_PNG = $(FIGURES_EPS:.eps=.png)
+ FIGURES_PDF = $(FIGURES_EPS:.eps=.pdf)
+ 
 -all: $(INFO_TARGET) $(TARGETS)
 +all: $(INFO_TARGET) $(HTML_TARGET)/index.html $(TARGETS)
  
- $(INFO_TARGET): $(SOURCES)
+ $(INFO_TARGET): $(SOURCES) $(FIGURES_PNG)
  	rm -f $(INFO_TARGET)*
  	makeinfo --output=$(INFO_TARGET) $(TEXINFO_ROOT).texinfo
  
- $(HTML_TARGET)/index.html: $(SOURCES)
+ $(HTML_TARGET)/index.html: $(SOURCES) $(FIGURES_PNG)
  	rm -rf $(HTML_TARGET)
 -	makeinfo --html $(TEXINFO_ROOT).texinfo
 +	makeinfo --html --css-ref=../style.css $(TEXINFO_ROOT).texinfo
 +	sed -e 's,href="../dir/index.html",href="../dir.html",g' $@ >$@.fixed
 +	mv $@.fixed $@
  
- $(PDF_TARGET): $(SOURCES)
+ $(PDF_TARGET): $(SOURCES) $(FIGURES_PDF)
  	texi2dvi --pdf $(TEX_OPTIONS) --output=$@ $(TEXINFO_ROOT).texinfo
  
- $(PS_TARGET): $(SOURCES)
+ $(PS_TARGET): $(SOURCES) $(FIGURES_EPS)
  	-rm -f $(DVI_TARGET)
  	texi2dvi $(TEX_OPTIONS) --output=$(DVI_TARGET) $(TEXINFO_ROOT).texinfo
  	dvips -q -o $@ $(DVI_TARGET)
diff --cc src/Setup.sh
index f770e21cb,7c814937d..47fb972d8
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@@ -111,8 -111,7 +111,8 @@@ for SUBDIR in ${INSTALLED_SUBDIRS} ${OT
      (cd ${SUBDIR} && ./Setup.sh ${1+"$@"})
  done
  
 +PLUGIN_SUBDIRS=
  for SUBDIR in ${PLUGIN_SUBDIRS}; do
      echo "setting up ${SUBDIR}"
-     (cd ${SUBDIR} && ./autogen.sh)
+     (cd ${SUBDIR} && ./autogen.sh >/dev/null 2>&1)
  done
diff --cc src/blowfish/Makefile.am
index 82c5ec743,696d880fe..aa453bbda
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@@ -91,13 -86,15 +91,14 @@@ CLEANFILES += @MIT_SCHEME_CLEAN
  TESTS = blowfish-check.sh
  CLEANFILES += test
  
--tags: tags-am
 -	./tags-fix.sh blowfish
++tags: tags-am $(sources) $(cdecls)
 +	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh
  
- EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm blowfish.pkg
 -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
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
  
  install-data-hook:
  	( echo '(add-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \
diff --cc src/cairo/Makefile.am
index 4dd3fb043,000000000..9c010b13a
mode 100644,000000..100644
--- a/src/cairo/Makefile.am
+++ b/src/cairo/Makefile.am
@@@ -1,125 -1,0 +1,124 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +##     2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of a Cairo plugin for MIT/GNU Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +ACLOCAL_AMFLAGS = -I m4
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)cairo
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +scminfodir = $(scmdocdir)/info
 +
 +scmlib_LTLIBRARIES = cairo-shim.la
 +scmlib_DATA = cairo-types.bin cairo-const.bin
 +
 +sources = cairo.scm cairo-graphics.scm
 +cdecls = cairo.cdecl
 +
 +binaries = cairo.bci cairo.com
 +binaries += cairo-graphics.bci cairo-graphics.com
 +
 +scmlib_sub_DATA = $(sources)
 +scmlib_sub_DATA += $(binaries)
 +scmlib_sub_DATA += make.scm cairo.pkg cairo-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +scminfo_DATA = cairo.info
 +info_TEXINFOS = cairo.texi
 +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +AM_UPDATE_INFO_DIR = no
 +
 +AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 +AM_CFLAGS = `pkg-config --cflags pangocairo`
 +AM_CFLAGS += @MIT_CFLAGS@
 +LIBS = `pkg-config --libs pangocairo`
 +
 +cairo_shim_la_LDFLAGS = -module -avoid-version -shared
++nodist_cairo_shim_la_SOURCES = cairo-shim.c
 +
 +noinst_PROGRAMS = cairo-const
- cairo_const_SOURCES = cairo-const.c
++nodist_cairo_const_SOURCES = cairo-const.c
 +
 +cairo-shim.c: stamp-shim
 +cairo-const.c: stamp-shim
 +cairo-types.bin: stamp-shim
 +stamp-shim: $(cdecls)
 +	touch stamp-shim
 +	echo '(generate-shim "cairo" "#include <pango/pangocairo.h>")' \
 +	| $(MIT_SCHEME_EXE) --batch-mode \
 +	|| rm stamp-shim
 +
 +cairo-const.bin: cairo-const.scm
 +	echo '(sf "cairo-const")' | $(MIT_SCHEME_EXE) --batch-mode
 +
 +cairo-const.scm: cairo-const
 +	./cairo-const
 +
 +cairo.bci: stamp-scheme
 +cairo.com: stamp-scheme
 +cairo-graphics.bci: stamp-scheme
 +cairo-graphics.com: stamp-scheme
 +cairo-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: stamp-shim $(sources) cairo.pkg
 +	touch stamp-scheme
 +	if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = cairo-const* cairo-shim.c
 +CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-shim stamp-scheme
 +
 +TESTS = cairo-check.sh
 +
- tags: tags-am
++tags: tags-am $(sources) $(cdecls)
++	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh cairo
 +
- ETAGS_ARGS = $(sources) -r '/^([^iI].*/' $(cdecls)
- TAGS_DEPENDENCIES = $(sources) $(cdecls)
- 
 +EXTRA_DIST += $(sources) $(cdecls) compile.sh cairo.pkg
 +EXTRA_DIST += cairo-check.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "cairo" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "cairo" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "cairo" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/devops/Makefile.am
index 8550d085c,000000000..4cd081729
mode 100644,000000..100644
--- a/src/devops/Makefile.am
+++ b/src/devops/Makefile.am
@@@ -1,94 -1,0 +1,93 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of a Developer Operations plugin for MIT/GNU
 +## Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)devops
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +scminfodir = $(scmdocdir)/info
 +
 +sources = devops.scm build.scm lint.scm
 +
 +binaries = devops.bin devops.bci devops.com
 +binaries += build.bin build.bci build.com
 +binaries += lint.bin lint.bci lint.com
 +
 +scmlib_sub_DATA = $(sources) $(binaries)
 +scmlib_sub_DATA += make.scm devops.pkg devops-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +scminfo_DATA = devops.info
 +info_TEXINFOS = devops.texi
 +devops_TEXINFOS = pucked.texi build.texi gfdl.texi
 +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +AM_UPDATE_INFO_DIR = no
 +
 +devops.bin: stamp-scheme
 +devops.bci: stamp-scheme
 +devops.com: stamp-scheme
 +build.bin: stamp-scheme
 +build.bci: stamp-scheme
 +build.com: stamp-scheme
 +lint.bin: stamp-scheme
 +lint.bci: stamp-scheme
 +lint.com: stamp-scheme
 +devops-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: $(sources) devops.pkg
 +	touch stamp-scheme
 +	if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-scheme
 +
- ETAGS_ARGS = $(sources)
- TAGS_DEPENDENCIES = $(sources)
++TAGS_FILES = $(sources)
 +
 +EXTRA_DIST += $(sources) compile.sh devops.pkg
 +EXTRA_DIST += make.scm optiondb.scm debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "devops" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "devops" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "devops" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/edwin/Makefile.am
index 884a45da3,d05a607db..86e2bed15
--- a/src/edwin/Makefile.am
+++ b/src/edwin/Makefile.am
@@@ -29,17 -29,15 +29,18 @@@ MIT_SCHEME_EXE = @MIT_SCHEME_TOOLCHAIN_
  scmlibdir = @MIT_SCHEME_LIBDIR@
  scmlib_subdir = $(scmlibdir)edwin
  scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +#scminfodir = $(scmdocdir)/info
  
- scmlib_sub_DATA = $(sources) $(binaries)
+ scmlib_sub_DATA = $(sources)
+ scmlib_sub_DATA += $(binaries)
  scmlib_sub_DATA += loadef.scm edwin.bld
 -scmlib_sub_DATA += make.scm edwin.pkg edwin-@MIT_SCHEME_OS_SUFFIX@.pkd
 +scmlib_sub_DATA += make.scm edwin.pkg @MIT_SCHEME_PKD@
  scmlib_sub_DATA += TUTORIAL
  
 -#info_TEXINFOS = mit-scheme-edwin.texi
 -#AM_MAKEINFOHTMLFLAGS = --no-split
 +#scminfo_DATA = edwin.info
 +#info_TEXINFOS = edwin.texi
 +#AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +#AM_UPDATE_INFO_DIR = no
  
  include $(srcdir)/source-dependencies.am
  edwin.bld: stamp-scheme
@@@ -51,25 -49,18 +52,28 @@@ stamp-scheme: $(sources) edwin.ldr edwi
  CLEANFILES = *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd *.bld
  CLEANFILES += stamp-scheme
  
+ #TESTS = edwin-check.sh
+ 
  TAGS_FILES = $(sources) edwin.ldr
  
- EXTRA_DIST += $(sources) edwin.ldr TUTORIAL
+ EXTRA_DIST += $(sources) edwin.ldr
+ EXTRA_DIST += TUTORIAL
 -EXTRA_DIST += sources.sh compile.sh decls.scm
 -EXTRA_DIST += edwin.sf edwin.cbf edwin.pkg
 +EXTRA_DIST += sources.scm sources.sh compile.sh decls.scm
 +EXTRA_DIST += edwin.sf edwin.cbf edwin.pkg debian
  
  install-data-hook:
 +	( echo '(add-plugin "edwin" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
  
  install-html: install-html-am
 +	( echo '(add-plugin "edwin" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
  
  install-info-am:
  
diff --cc src/gdbm/Makefile.am
index e65e59632,b8fa64072..a85b05d94
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@@ -91,13 -86,15 +91,14 @@@ CLEANFILES += @MIT_SCHEME_CLEAN
  TESTS = gdbm-check.sh
  CLEANFILES += gdbm-check.db
  
--tags: tags-am
 -	./tags-fix.sh gdbm
++tags: tags-am $(sources) $(cdecls)
 +	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh
  
- EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm gdbm.pkg
 -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
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
  
  install-data-hook:
  	( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
diff --cc src/gl/Makefile.am
index d31fd5e98,000000000..71e2c3f19
mode 100644,000000..100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@@ -1,130 -1,0 +1,129 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +##     2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of an OpenGL plugin for MIT/GNU Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +ACLOCAL_AMFLAGS = -I m4
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)gl
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +#scminfodir = $(scmdocdir)/info
 +
 +scmlib_LTLIBRARIES = gl-shim.la
 +scmlib_DATA = gl-types.bin gl-const.bin
 +
 +sources = gl.scm gl-glx.scm gl-glxgears.scm
 +cdecls = gl.cdecl
 +
 +binaries = gl.bci gl.com
 +binaries += gl-glx.bci gl-glx.com
 +binaries += gl-glxgears.bci gl-glxgears.com
 +
 +scmlib_sub_DATA = $(sources)
 +scmlib_sub_DATA += $(binaries)
 +scmlib_sub_DATA += make.scm gl.pkg gl-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +#scminfo_DATA = gl.info
 +#info_TEXINFOS = gl.texi
 +#AM_MAKEINFOHTMLFLAGS = --no-split
 +#AM_UPDATE_INFO_DIR = no
 +
 +AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 +AM_CFLAGS = `pkg-config --cflags gl glu gtk+-3.0`
 +AM_CFLAGS += @MIT_CFLAGS@
 +LIBS = `pkg-config --libs gl glu gtk+-3.0`
 +
- gl_shim_la_LIBADD = gl-adapter.lo
 +gl_shim_la_LDFLAGS = -module -avoid-version -shared
++gl_shim_la_SOURCES = gl-adapter.c
++nodist_gl_shim_la_SOURCES = gl-shim.c
 +
 +noinst_PROGRAMS = gl-const
- gl_const_SOURCES = gl-const.c gl-shim.h
++gl_const_SOURCES = gl-shim.h
++nodist_gl_const_SOURCES = gl-const.c
 +
 +gl-shim.c: stamp-shim
 +gl-const.c: stamp-shim
 +gl-types.bin: stamp-shim
 +stamp-shim: gl-shim.h $(cdecls)
 +	touch stamp-shim
 +	echo '(generate-shim "gl" "#include \"gl-shim.h\"")' \
 +	| $(MIT_SCHEME_EXE) --batch-mode \
 +	|| rm stamp-shim
 +
 +gl-const.bin: gl-const.scm
 +	echo '(sf "gl-const")' | $(MIT_SCHEME_EXE) --batch-mode
 +
 +gl-const.scm: gl-const
 +	./gl-const
 +
 +gl.bci: stamp-scheme
 +gl.com: stamp-scheme
 +gl-glx.bci: stamp-scheme
 +gl-glx.com: stamp-scheme
 +gl-glxgears.bci: stamp-scheme
 +gl-glxgears.com: stamp-scheme
 +gl-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: stamp-shim $(sources) gl.pkg
 +	touch stamp-scheme
 +	if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = gl-const* gl-shim.c
 +CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-shim stamp-scheme
 +
 +TESTS = gl-check.sh
 +
- tags: tags-am
++tags: tags-am $(sources) $(cdecls)
++	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh gl
 +
- all_sources = $(sources) gl-adapter.c
- ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
- TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
- 
- EXTRA_DIST += $(all_sources) $(cdecls) compile.sh gl.pkg
++EXTRA_DIST += $(sources) $(cdecls) compile.sh gl.pkg
 +EXTRA_DIST += gl-tests.scm gl-check.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "gl" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "gl" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "gl" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/glib/Makefile.am
index 29d9e7d57,000000000..1a0fbd252
mode 100644,000000..100644
--- a/src/glib/Makefile.am
+++ b/src/glib/Makefile.am
@@@ -1,137 -1,0 +1,135 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +##     2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of a GLib plugin for MIT/GNU Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +ACLOCAL_AMFLAGS = -I m4
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)glib
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +scminfodir = $(scmdocdir)/info
 +
 +scmlib_LTLIBRARIES = glib-shim.la
 +scmlib_DATA = glib-types.bin glib-const.bin
 +
 +sources = glib.scm gobject.scm gio.scm glib-main.scm glib-thread.scm
 +cdecls = glib.cdecl Includes/*.cdecl Includes/*/*.cdecl
 +
 +binaries = glib.bci glib.com
 +binaries += gobject.bci gobject.com
 +binaries += gio.bci gio.com
 +binaries += glib-main.bci glib-main.com
 +binaries += glib-thread.bci glib-thread.com
 +
 +scmlib_sub_DATA = $(sources)
 +scmlib_sub_DATA += $(binaries)
 +scmlib_sub_DATA += make.scm glib.pkg glib-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +scminfo_DATA = glib.info
 +info_TEXINFOS = glib.texi
 +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +AM_UPDATE_INFO_DIR = no
 +
 +AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 +AM_CFLAGS = `pkg-config --cflags gio-2.0`
 +AM_CFLAGS += @MIT_CFLAGS@
 +LIBS = `pkg-config --libs glib-2.0 gthread-2.0 gio-2.0`
 +
- glib_shim_la_LIBADD = glibio.lo
++nodist_glib_shim_la_SOURCES = glib-shim.c
 +glib_shim_la_LDFLAGS = -module -avoid-version -shared
 +
 +noinst_PROGRAMS = glib-const
- glib_const_SOURCES = glib-const.c glib-shim.h
++glib_const_SOURCES = glib-shim.h
++nodist_glib_const_SOURCES = glib-const.c
 +
 +glib-shim.c: stamp-shim
 +glib-const.c: stamp-shim
 +glib-types.bin: stamp-shim
 +stamp-shim: glib-shim.h $(cdecls)
 +	touch stamp-shim
 +	echo '(generate-shim "glib" "#include \"glib-shim.h\"")' \
 +	| $(MIT_SCHEME_EXE) --batch-mode \
 +	|| rm stamp-shim
 +
 +glib-const.bin: glib-const.scm
 +	echo '(sf "glib-const")' | $(MIT_SCHEME_EXE) --batch-mode
 +
 +glib-const.scm: glib-const
 +	./glib-const
 +
 +glib.bci: stamp-scheme
 +glib.com: stamp-scheme
 +gobject.bci: stamp-scheme
 +gobject.com: stamp-scheme
 +gio.bci: stamp-scheme
 +gio.com: stamp-scheme
 +glib-main.bci: stamp-scheme
 +glib-main.com: stamp-scheme
 +glib-thread.bci: stamp-scheme
 +glib-thread.com: stamp-scheme
 +glib-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: stamp-shim $(sources) glib.pkg
 +	touch stamp-scheme
 +	if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = glib-const* glib-shim.c
 +CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-shim stamp-scheme
 +
 +TESTS = glib-check-copy.sh glib-check-list.sh
 +CLEANFILES += test-copy-1.txt
 +
- tags: tags-am
++tags: tags-am $(sources) $(cdecls)
++	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh glib
 +
- all_sources = $(sources) glibio.c
- ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
- TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
- 
- EXTRA_DIST += $(all_sources) $(cdecls) compile.sh glib.pkg
++EXTRA_DIST += $(sources) $(cdecls) compile.sh glib.pkg
 +EXTRA_DIST += glib-tests.scm glib-check-copy.sh glib-check-list.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "glib" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "glib" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "glib" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/gtk-screen/Makefile.am
index f1314fccb,000000000..67c17b3cf
mode 100644,000000..100644
--- a/src/gtk-screen/Makefile.am
+++ b/src/gtk-screen/Makefile.am
@@@ -1,93 -1,0 +1,92 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +##     2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of a Gtk screen plugin for MIT/GNU Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)gtk-screen
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +#scminfodir = $(scmdocdir)/info
 +
 +sources = gtk-screen.scm gtk-faces.scm
 +
 +scmlib_sub_DATA = $(sources)
 +scmlib_sub_DATA += gtk-screen.bin gtk-screen.bci gtk-screen.com
 +scmlib_sub_DATA += gtk-faces.bin gtk-faces.bci gtk-faces.com
 +scmlib_sub_DATA += make.scm gtk-screen.pkg
 +scmlib_sub_DATA += gtk-screen-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +#scminfo_DATA = gtk-screen.info
 +#info_TEXINFOS = gtk-screen.texi
 +#AM_MAKEINFOHTMLFLAGS = --no-split
 +#AM_UPDATE_INFO_DIR = no
 +
 +gtk-screen.bin: stamp-scheme
 +gtk-screen.bci: stamp-scheme
 +gtk-screen.com: stamp-scheme
 +gtk-faces.bin: stamp-scheme
 +gtk-faces.bci: stamp-scheme
 +gtk-faces.com: stamp-scheme
 +gtk-screen-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: $(sources) gtk-screen.pkg
 +	touch stamp-scheme
 +	if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-scheme
 +
 +TESTS = check.sh
 +
- ETAGS_ARGS = $(sources)
- TAGS_DEPENDENCIES = $(sources)
++TAGS_FILES = $(sources)
 +
 +EXTRA_DIST += $(sources) compile.sh gtk-screen.pkg
 +EXTRA_DIST += check.sh
 +EXTRA_DIST += make.scm optiondb.scm
 +EXTRA_DIST += debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "gtk-screen" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "gtk-screen" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "gtk-screen" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/gtk/Makefile.am
index dfaf48ab2,000000000..322fcc151
mode 100644,000000..100644
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@@ -1,173 -1,0 +1,172 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +##     2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of a Gtk plugin for MIT/GNU Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +ACLOCAL_AMFLAGS = -I m4
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)gtk
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +scminfodir = $(scmdocdir)/info
 +
 +scmlib_LTLIBRARIES = gtk-shim.la
 +scmlib_DATA = gtk-types.bin gtk-const.bin conses.png
 +
 +sources = gtk.scm gdk.scm gtk-widget.scm
 +sources += scm-widget.scm fix-layout.scm keys.scm main.scm
 +sources += gtk-ev.scm gtk-graphics.scm fix-demo.scm swat.scm
 +sources += swat-pole-zero.scm
 +cdecls = gtk.cdecl Includes/*.cdecl
 +
 +binaries = gtk.bci gtk.com
 +binaries += gdk.bci gdk.com
 +binaries += gtk-widget.bci gtk-widget.com
 +binaries += scm-widget.bci scm-widget.com
 +binaries += fix-layout.bci fix-layout.com
 +binaries += keys.bci keys.com
 +binaries += main.bci main.com
 +binaries += gtk-ev.bci gtk-ev.com
 +binaries += gtk-graphics.bci gtk-graphics.com
 +binaries += fix-demo.bci fix-demo.com
 +binaries += swat.bci swat.com
 +binaries += swat-pole-zero.bci swat-pole-zero.com
 +
 +scmlib_sub_DATA = $(sources)
 +scmlib_sub_DATA += $(binaries)
 +scmlib_sub_DATA += make.scm gtk.pkg gtk-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +scminfo_DATA = gtk.info
 +info_TEXINFOS = gtk.texi
 +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +AM_UPDATE_INFO_DIR = no
 +
 +AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 +AM_CFLAGS = `pkg-config --cflags gtk+-3.0`
 +AM_CFLAGS += @MIT_CFLAGS@
 +LIBS = `pkg-config --libs gtk+-3.0 gthread-2.0`
 +
- gtk_shim_la_LIBADD = gtkio.lo scmwidget.lo gtkpanedview.lo gtkscrolledview.lo
 +c_sources = gtk-shim.h gtkio.c
 +c_sources += scmwidget.c scmwidget.h
 +c_sources += gtkpanedview.c gtkpanedview.h
 +c_sources += gtkscrolledview.c gtkscrolledview.h
++gtk_shim_la_SOURCES = $(c_sources)
++nodist_gtk_shim_la_SOURCES = gtk-shim.c
 +gtk_shim_la_LDFLAGS = -module -avoid-version -shared
 +
 +noinst_PROGRAMS = gtk-const
- gtk_const_SOURCES = gtk-const.c gtk-shim.h
++gtk_const_SOURCES = gtk-shim.h
++nodist_gtk_const_SOURCES = gtk-const.c
 +
 +gtk-shim.c: stamp-shim
 +gtk-const.c: stamp-shim
 +gtk-types.bin: stamp-shim
 +stamp-shim: $(c_sources) $(cdecls)
 +	touch stamp-shim
 +	echo '(generate-shim "gtk" "#include \"gtk-shim.h\"")' \
 +	| $(MIT_SCHEME_EXE) --batch-mode \
 +	|| rm stamp-shim
 +
 +gtk-const.bin: gtk-const.scm
 +	echo '(sf "gtk-const")' | $(MIT_SCHEME_EXE) --batch-mode
 +
 +gtk-const.scm: gtk-const
 +	./gtk-const
 +
 +gtk.bci: stamp-scheme
 +gtk.com: stamp-scheme
 +gdk.bci: stamp-scheme
 +gdk.com: stamp-scheme
 +gtk-widget.bci: stamp-scheme
 +gtk-widget.com: stamp-scheme
 +scm-widget.bci: stamp-scheme
 +scm-widget.com: stamp-scheme
 +fix-layout.bci: stamp-scheme
 +fix-layout.com: stamp-scheme
 +keys.bci: stamp-scheme
 +keys.com: stamp-scheme
 +main.bci: stamp-scheme
 +main.com: stamp-scheme
 +gtk-ev.bci: stamp-scheme
 +gtk-ev.com: stamp-scheme
 +gtk-graphics.bci: stamp-scheme
 +gtk-graphics.com: stamp-scheme
 +fix-demo.bci: stamp-scheme
 +fix-demo.com: stamp-scheme
 +swat.bci: stamp-scheme
 +swat.com: stamp-scheme
 +swat-pole-zero.bci: stamp-scheme
 +swat-pole-zero.com: stamp-scheme
 +gtk-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: stamp-shim $(sources) gtk.pkg
 +	touch stamp-scheme
 +	if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = gtk-const* gtk-shim.c
 +CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-shim stamp-scheme
 +
 +TESTS = gtk-check.sh
 +
- tags: tags-am
++tags: tags-am $(sources) $(cdecls)
++	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh gtk
 +
- all_sources = $(sources) $(c_sources)
- ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
- TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
- 
- EXTRA_DIST += $(all_sources) $(cdecls) compile.sh gtk.pkg
++EXTRA_DIST += $(sources) $(cdecls) compile.sh gtk.pkg
 +EXTRA_DIST += gtk-tests.scm gtk-check.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 +EXTRA_DIST += gtkpanedview-3.6.0.c gtkscrolledview-3.6.0.c
 +EXTRA_DIST += gtkpanedview-3.10.8.c gtkscrolledview-3.10.8.c
 +EXTRA_DIST += gtkpanedview-3.14.13.c gtkscrolledview-3.14.13.c
 +EXTRA_DIST += gtkpanedview-3.16.7.c gtkscrolledview-3.16.7.c
 +EXTRA_DIST += gtkpanedview-3.18.9.c gtkscrolledview-3.18.9.c
 +EXTRA_DIST += gtkpanedview-3.20.9.c gtkscrolledview-3.20.9.c
 +EXTRA_DIST += gtkpanedview-3.22.11.c gtkscrolledview-3.22.11.c
 +EXTRA_DIST += conses.png hello.scm test-gport-performance.scm
 +EXTRA_DIST += debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "gtk" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "gtk" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "gtk" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/mcrypt/Makefile.am
index 7fae2e567,6cd2e56fb..e6a457a2c
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@@ -91,13 -86,15 +91,14 @@@ CLEANFILES += @MIT_SCHEME_CLEAN
  TESTS = mcrypt-check.sh
  CLEANFILES += encrypted decrypted
  
--tags: tags-am
 -	./tags-fix.sh mcrypt
++tags: tags-am $(sources) $(cdecls)
 +	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh
  
- EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm mcrypt.pkg
 -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
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
  
  install-data-hook:
  	( echo '(add-plugin "mcrypt" "@MIT_SCHEME_PROJECT@"'; \
diff --cc src/pango/Makefile.am
index 5a9360ddb,000000000..0d8c99886
mode 100644,000000..100644
--- a/src/pango/Makefile.am
+++ b/src/pango/Makefile.am
@@@ -1,122 -1,0 +1,121 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +##     2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of a Pango plugin for MIT/GNU Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +ACLOCAL_AMFLAGS = -I m4
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)pango
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +scminfodir = $(scmdocdir)/info
 +
 +scmlib_LTLIBRARIES = pango-shim.la
 +scmlib_DATA = pango-types.bin pango-const.bin
 +
 +sources = pango.scm
 +cdecls = pango.cdecl Includes/*.cdecl
 +
 +binaries = pango.bci pango.com
 +
 +scmlib_sub_DATA = $(sources)
 +scmlib_sub_DATA += $(binaries)
 +scmlib_sub_DATA += make.scm pango.pkg pango-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +scminfo_DATA = pango.info
 +info_TEXINFOS = pango.texi
 +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +AM_UPDATE_INFO_DIR = no
 +
 +AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 +AM_CFLAGS = `pkg-config --cflags pango`
 +AM_CFLAGS += @MIT_CFLAGS@
 +LIBS = `pkg-config --libs pango`
 +
++nodist_pango_shim_la_SOURCES = pango-shim.c
 +pango_shim_la_LDFLAGS = -module -avoid-version -shared
 +
 +noinst_PROGRAMS = pango-const
- pango_const_SOURCES = pango-const.c
++nodist_pango_const_SOURCES = pango-const.c
 +
 +pango-shim.c: stamp-shim
 +pango-const.c: stamp-shim
 +pango-types.bin: stamp-shim
 +stamp-shim: $(cdecls)
 +	touch stamp-shim
 +	echo '(generate-shim "pango" "#include <pango/pango.h>")' \
 +	| $(MIT_SCHEME_EXE) --batch-mode \
 +	|| rm stamp-shim
 +
 +pango-const.bin: pango-const.scm
 +	echo '(sf "pango-const")' | $(MIT_SCHEME_EXE) --batch-mode
 +
 +pango-const.scm: pango-const
 +	./pango-const
 +
 +pango.bci: stamp-scheme
 +pango.com: stamp-scheme
 +pango-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: stamp-shim $(sources) pango.pkg
 +	touch stamp-scheme
 +	if ! ./compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = pango-const* pango-shim.c
 +CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-shim stamp-scheme
 +
 +TESTS = pango-check.sh
 +
- tags: tags-am
++tags: tags-am $(sources) $(cdecls)
++	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh pango
 +
- ETAGS_ARGS = $(sources) -r '/^([^iI].*/' $(cdecls)
- TAGS_DEPENDENCIES = $(sources) $(cdecls)
- 
 +EXTRA_DIST += $(sources) $(cdecls) compile.sh pango.pkg
 +EXTRA_DIST += pango-check.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "pango" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "pango" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "pango" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/pgsql/Makefile.am
index 06ea2e67c,e450ed4a2..b397b63c4
--- a/src/pgsql/Makefile.am
+++ b/src/pgsql/Makefile.am
@@@ -92,13 -86,15 +92,13 @@@ CLEANFILES += @MIT_SCHEME_CLEAN
  TESTS = pgsql-check.sh
  CLEANFILES += pgsql-check.db
  
--tags: tags-am
 -	./tags-fix.sh pgsql
++tags: tags-am $(sources) $(cdecls)
 +	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh
  
 -TAGS_FILES = $(sources) $(cdecls)
 -
 -EXTRA_DIST += $(sources) $(cdecls)
 -EXTRA_DIST += compile.sh compile.scm pgsql.pkg
 +EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm pgsql.pkg
  EXTRA_DIST += pgsql-check.scm pgsql-check.sh
 -EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
  
  install-data-hook:
  	( echo '(add-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \
diff --cc src/planetarium/Makefile.am
index f2114fcc5,000000000..e02e72e7c
mode 100644,000000..100644
--- a/src/planetarium/Makefile.am
+++ b/src/planetarium/Makefile.am
@@@ -1,145 -1,0 +1,144 @@@
 +## Process this file with automake to produce Makefile.in
 +##
 +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
 +##     2016, 2017, 2018 Matthew Birkholz
 +##
 +## This file is part of a planetarium plugin for MIT/GNU Scheme Pucked.
 +##
 +## This plugin is free software; you can redistribute it and/or modify
 +## it under the terms of the GNU General Public License as published
 +## by the Free Software Foundation; either version 2 of the License,
 +## or (at your option) any later version.
 +##
 +## This plugin 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 plugin; if not, write to the Free Software
 +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 +## 02110-1301, USA.
 +
 +EXTRA_DIST = autogen.sh
 +
 +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 +scmlibdir = @MIT_SCHEME_LIBDIR@
 +scmlib_subdir = $(scmlibdir)planetarium
 +scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +scminfodir = $(scmdocdir)/info
 +
 +sources = earth.scm geometry.scm google-earth.scm graphics.scm
 +sources += matrices.scm mit-cairo.scm mit-cil.scm mit-graphics.scm mit-gtk.scm
 +sources += mit-r3rs.scm mit-syntax.scm mit-x.scm solar.scm tellurion.scm
 +sources += terrain.scm time.scm
 +
 +binaries = earth.bci earth.com
 +binaries += geometry.bci geometry.com
 +binaries += google-earth.bci google-earth.com
 +binaries += graphics.bci graphics.com
 +binaries += matrices.bci matrices.com
 +binaries += mit-cairo.bci mit-cairo.com
 +binaries += mit-cil.bci mit-cil.com
 +binaries += mit-graphics.bci mit-graphics.com
 +binaries += mit-gtk.bci mit-gtk.com
 +binaries += mit-r3rs.bci mit-r3rs.com
 +binaries += mit-syntax.bci mit-syntax.com
 +binaries += mit-x.bci mit-x.com
 +binaries += solar.bci solar.com
 +binaries += tellurion.bci tellurion.com
 +binaries += terrain.bci terrain.com
 +binaries += time.bci time.com
 +
 +scmlib_sub_DATA = $(sources)
 +scmlib_sub_DATA += $(binaries)
 +scmlib_sub_DATA += make.scm mit.pkg mit-@MIT_SCHEME_OS_SUFFIX@.pkd
 +scmlib_sub_DATA += mit-link.scm mit-3d.pkg mit-3d-@MIT_SCHEME_OS_SUFFIX@.pkd
 +
 +scminfo_DATA = planetarium.info
 +info_TEXINFOS = planetarium.texi
 +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +AM_UPDATE_INFO_DIR = no
 +
 +make.scm: mit-make.scm
 +	cp $< $@
 +
 +earth.bci: stamp-scheme
 +earth.com: stamp-scheme
 +geometry.bci: stamp-scheme
 +geometry.com: stamp-scheme
 +google-earth.bci: stamp-scheme
 +google-earth.com: stamp-scheme
 +graphics.bci: stamp-scheme
 +graphics.com: stamp-scheme
 +matrices.bci: stamp-scheme
 +matrices.com: stamp-scheme
 +mit-cairo.bci: stamp-scheme
 +mit-cairo.com: stamp-scheme
 +mit-cil.bci: stamp-scheme
 +mit-cil.com: stamp-scheme
 +mit-graphics.bci: stamp-scheme
 +mit-graphics.com: stamp-scheme
 +mit-gtk.bci: stamp-scheme
 +mit-gtk.com: stamp-scheme
 +mit-r3rs.bci: stamp-scheme
 +mit-r3rs.com: stamp-scheme
 +mit-syntax.bci: stamp-scheme
 +mit-syntax.com: stamp-scheme
 +mit-x.bci: stamp-scheme
 +mit-x.com: stamp-scheme
 +solar.bci: stamp-scheme
 +solar.com: stamp-scheme
 +tellurion.bci: stamp-scheme
 +tellurion.com: stamp-scheme
 +terrain.bci: stamp-scheme
 +terrain.com: stamp-scheme
 +time.bci: stamp-scheme
 +time.com: stamp-scheme
 +mit-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +mit-3d-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme
 +stamp-scheme: $(sources) mit.pkg mit-3d.pkg
 +	touch stamp-scheme
 +	if ! ./mit-compile.sh; then rm stamp-scheme; exit 1; fi
 +
 +CLEANFILES = *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd
 +CLEANFILES += stamp-scheme
 +CLEANFILES += make.scm
 +
 +TESTS = mit-check.sh
 +CLEANFILES += sample-terrain.txt
 +
- ETAGS_ARGS = $(sources)
- TAGS_DEPENDENCIES = $(sources)
++TAGS_FILES = $(sources)
 +
 +EXTRA_DIST += $(sources) mit-compile.sh mit-link.scm mit.pkg mit-3d.pkg
 +EXTRA_DIST += mit-check.sh
 +EXTRA_DIST += mit-make.scm mit-optiondb.scm cil-*.txt
 +EXTRA_DIST += mit-snapshot.scm
 +EXTRA_DIST += debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "planetarium" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "planetarium" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "planetarium" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/x11-screen/Makefile.am
index 7e7370f3c,8a6dfea36..4a91867d2
--- a/src/x11-screen/Makefile.am
+++ b/src/x11-screen/Makefile.am
@@@ -56,33 -53,6 +56,33 @@@ TESTS = x11-screen-check.s
  
  TAGS_FILES = $(sources)
  
 -EXTRA_DIST += $(sources) compile.sh x11-screen.pkg
 +EXTRA_DIST += $(sources) compile.sh compile.scm x11-screen.pkg
- EXTRA_DIST += x11-screen-test.scm x11-screen-check.sh
+ EXTRA_DIST += x11-screen-check.sh x11-screen-test.scm
 -EXTRA_DIST += make.scm optiondb.scm compile.scm
 +EXTRA_DIST += make.scm optiondb.scm debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"
diff --cc src/x11/Makefile.am
index 7464a1f43,eacb6f134..ac7271a19
--- a/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@@ -51,14 -48,13 +51,14 @@@ scmlib_sub_DATA += make.scm x11.pkg @MI
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
  AM_CFLAGS = @MIT_CFLAGS@
  
- x11_shim_la_LIBADD = @MIT_LIBS@
- x11_shim_la_LDFLAGS = -module -avoid-version -shared
 +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_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_LDFLAGS = -module -avoid-version -shared
  
  noinst_PROGRAMS = x11-const$(EXEEXT)
 -x11_const_SOURCES = x11-const.c x11-shim.h x11.h
 +x11_const_SOURCES = x11-shim.h x11.h
 +nodist_x11_const_SOURCES = x11-const.c
  
  x11-shim.c: stamp-shim
  x11-const.c: stamp-shim
@@@ -91,37 -87,12 +91,38 @@@ CLEANFILES += @MIT_SCHEME_CLEAN
  
  TESTS = x11-check.sh
  
--tags: tags-am
 -	./tags-fix.sh x11
 -
 -TAGS_FILES = $(sources) $(cdecls)
++tags: tags-am $(sources) $(cdecls)
 +	$(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
 +	./tags-fix.sh
  
- EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm x11.pkg
- EXTRA_DIST += x11-test.scm x11-check.sh
+ EXTRA_DIST += $(sources) $(cdecls)
+ EXTRA_DIST += compile.sh compile.scm x11.pkg
+ EXTRA_DIST += x11-check.sh x11-test.scm
 -EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
 +
 +install-data-hook:
 +	( echo '(add-plugin "x11" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-html: install-html-am
 +	( echo '(add-plugin "x11" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '            "$(DESTDIR)$(infodir)"'; \
 +	  echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +
 +install-info-am:
 +
 +uninstall-info-am:
 +
 +uninstall-hook:
 +	( echo '(remove-plugin "x11" "@MIT_SCHEME_PROJECT@"'; \
 +	  echo '               "$(DESTDIR)$(infodir)"'; \
 +	  echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +	  echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +	| $(MIT_SCHEME_EXE) --batch-mode
 +	[ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +	&& rmdir "$(DESTDIR)$(scmlib_subdir)"