From: Matt Birkholz Date: Thu, 25 Jul 2019 13:31:43 +0000 (-0500) Subject: Plugin Makefile.am improvements. X-Git-Tag: mit-scheme-pucked-10.1.12~7^2~1 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7f8e68761cdc31045294aa44d58c1e1c1b47b5d7;p=mit-scheme.git Plugin Makefile.am improvements. These were backported from recent improvements to x11/Makefile.am. + Use EXEEXT where appropriate. + Add MOSTLYCLEANFILES and mostlyclean-local. + Use TAGS_FILES and punt the ETAGS_ARGS misuse. + Add -adapter.lo to _shim_la_OBJECTS, not _shim_la_LIBADD. + Eliminate trailing whitespace. + Correct the copyright notices for x11 and x11-screen. + Punt stamp-scheme's dependence on -const.bin (redundant to the dependence on stamp-shim). --- diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am index 2f93a0800..696d880fe 100644 --- a/src/blowfish/Makefile.am +++ b/src/blowfish/Makefile.am @@ -5,19 +5,19 @@ ## 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, ## 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of ## Technology -## +## ## This file is part of MIT/GNU Scheme. -## +## ## MIT/GNU Scheme 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. -## +## ## MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, @@ -51,7 +51,7 @@ AM_CFLAGS = @MIT_CFLAGS@ blowfish_shim_la_LIBADD = blowfish-adapter.lo blowfish_shim_la_LDFLAGS = -module -avoid-version -shared -noinst_PROGRAMS = blowfish-const +noinst_PROGRAMS = blowfish-const$(EXEEXT) blowfish_const_SOURCES = blowfish-const.c blowfish-shim.h blowfish-shim.c: stamp-shim @@ -65,7 +65,7 @@ stamp-shim: blowfish-shim.h $(cdecls) blowfish-const.bin: blowfish-const.scm echo '(sf "blowfish-const")' | $(MIT_SCHEME_EXE) --batch-mode -blowfish-const.scm: blowfish-const +blowfish-const.scm: blowfish-const$(EXEEXT) ./blowfish-const @MIT_SCHEME_DEPS@ @@ -73,6 +73,11 @@ stamp-scheme: stamp-shim $(sources) blowfish.pkg MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh echo "done" > $@ +MOSTLYCLEANFILES = $(scmlib_LTLIBRARIES) blowfish-const$(EXEEXT) + +mostlyclean-local: + -rm -rf .libs + CLEANFILES = blowfish-const* blowfish-shim.c CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd CLEANFILES += stamp-shim stamp-scheme @@ -84,11 +89,10 @@ CLEANFILES += test tags: tags-am ./tags-fix.sh blowfish -all_sources = $(sources) blowfish-adapter.c -ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) -TAGS_DEPENDENCIES = $(all_sources) $(cdecls) +TAGS_FILES = $(sources) blowfish-adapter.c $(cdecls) -EXTRA_DIST += $(all_sources) $(cdecls) compile.sh compile.scm blowfish.pkg +EXTRA_DIST += $(sources) blowfish-adapter.c $(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/edwin/Makefile.am b/src/edwin/Makefile.am index bdca6c4a3..d05a607db 100644 --- a/src/edwin/Makefile.am +++ b/src/edwin/Makefile.am @@ -51,11 +51,11 @@ CLEANFILES += stamp-scheme #TESTS = edwin-check.sh -ETAGS_ARGS = $(sources) edwin.ldr -TAGS_DEPENDENCIES = $(sources) edwin.ldr +TAGS_FILES = $(sources) edwin.ldr -EXTRA_DIST += $(sources) TUTORIAL -EXTRA_DIST += sources.sh compile.sh decls.scm edwin.ldr +EXTRA_DIST += $(sources) edwin.ldr +EXTRA_DIST += TUTORIAL +EXTRA_DIST += sources.sh compile.sh decls.scm EXTRA_DIST += edwin.sf edwin.cbf edwin.pkg install-data-hook: diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am index e8a5668dd..b8fa64072 100644 --- a/src/gdbm/Makefile.am +++ b/src/gdbm/Makefile.am @@ -5,19 +5,19 @@ ## 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, ## 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of ## Technology -## +## ## This file is part of MIT/GNU Scheme. -## +## ## MIT/GNU Scheme 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. -## +## ## MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, @@ -51,7 +51,7 @@ AM_CFLAGS = @MIT_CFLAGS@ gdbm_shim_la_LIBADD = gdbm-adapter.lo gdbm_shim_la_LDFLAGS = -module -avoid-version -shared -noinst_PROGRAMS = gdbm-const +noinst_PROGRAMS = gdbm-const$(EXEEXT) gdbm_const_SOURCES = gdbm-const.c gdbm-shim.h gdbm-shim.c: stamp-shim @@ -65,7 +65,7 @@ stamp-shim: gdbm-shim.h $(cdecls) gdbm-const.bin: gdbm-const.scm echo '(sf "gdbm-const")' | $(MIT_SCHEME_EXE) --batch-mode -gdbm-const.scm: gdbm-const +gdbm-const.scm: gdbm-const$(EXEEXT) ./gdbm-const @MIT_SCHEME_DEPS@ @@ -73,6 +73,11 @@ stamp-scheme: stamp-shim $(sources) gdbm.pkg MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh echo "done" > $@ +MOSTLYCLEANFILES = $(scmlib_LTLIBRARIES) gdbm-const$(EXEEXT) + +mostlyclean-local: + -rm -rf .libs + CLEANFILES = gdbm-const* gdbm-shim.c CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd CLEANFILES += stamp-shim stamp-scheme @@ -84,11 +89,10 @@ CLEANFILES += gdbm-check.db tags: tags-am ./tags-fix.sh gdbm -all_sources = $(sources) gdbm-adapter.c -ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) -TAGS_DEPENDENCIES = $(all_sources) $(cdecls) +TAGS_FILES = $(sources) gdbm-adapter.c $(cdecls) -EXTRA_DIST += $(all_sources) $(cdecls) compile.scm gdbm.pkg +EXTRA_DIST += $(sources) gdbm-adapter.c $(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/imail/Makefile.am b/src/imail/Makefile.am index edab70939..d45e2f255 100644 --- a/src/imail/Makefile.am +++ b/src/imail/Makefile.am @@ -88,8 +88,7 @@ CLEANFILES += stamp-scheme #TESTS = imail-check.sh -ETAGS_ARGS = $(sources) -TAGS_DEPENDENCIES = $(sources) +TAGS_FILES = $(sources) EXTRA_DIST += $(sources) compile.sh make.scm compile.scm imail.pkg diff --git a/src/mcrypt/Makefile.am b/src/mcrypt/Makefile.am index b0ea1cc77..6cd2e56fb 100644 --- a/src/mcrypt/Makefile.am +++ b/src/mcrypt/Makefile.am @@ -5,19 +5,19 @@ ## 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, ## 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of ## Technology -## +## ## This file is part of MIT/GNU Scheme. -## +## ## MIT/GNU Scheme 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. -## +## ## MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, @@ -51,7 +51,7 @@ AM_CFLAGS = @MIT_CFLAGS@ mcrypt_shim_la_LIBADD = mcrypt-adapter.lo mcrypt_shim_la_LDFLAGS = -module -avoid-version -shared -noinst_PROGRAMS = mcrypt-const +noinst_PROGRAMS = mcrypt-const$(EXEEXT) mcrypt_const_SOURCES = mcrypt-const.c mcrypt-shim.h mcrypt-shim.c: stamp-shim @@ -65,7 +65,7 @@ stamp-shim: mcrypt-shim.h $(cdecls) mcrypt-const.bin: mcrypt-const.scm echo '(sf "mcrypt-const")' | $(MIT_SCHEME_EXE) --batch-mode -mcrypt-const.scm: mcrypt-const +mcrypt-const.scm: mcrypt-const$(EXEEXT) ./mcrypt-const @MIT_SCHEME_DEPS@ @@ -73,6 +73,11 @@ stamp-scheme: stamp-shim $(sources) mcrypt.pkg MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh echo "done" > $@ +MOSTLYCLEANFILES = $(scmlib_LTLIBRARIES) mcyrpt-const$(EXEEXT) + +mostlyclean-local: + -rm -rf .libs + CLEANFILES = mcrypt-const* mcrypt-shim.c CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd CLEANFILES += stamp-shim stamp-scheme @@ -84,11 +89,10 @@ CLEANFILES += encrypted decrypted tags: tags-am ./tags-fix.sh mcrypt -all_sources = $(sources) mcrypt-adapter.c -ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) -TAGS_DEPENDENCIES = $(all_sources) $(cdecls) +TAGS_FILES = $(sources) mcrypt-adapter.c $(cdecls) -EXTRA_DIST += $(all_sources) $(cdecls) compile.scm mcrypt.pkg +EXTRA_DIST += $(sources) mcrypt-adapter.c $(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 @@ -96,20 +100,16 @@ install-data-hook: ( echo '(add-plugin "mcrypt" "@MIT_SCHEME_PROJECT@"'; \ echo ' ""'; \ echo ' "$(DESTDIR)$(scmlibdir)"'; \ - echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + echo ' "")' ) \ | $(MIT_SCHEME_EXE) --batch-mode install-html: install-html-am ( echo '(add-plugin "mcrypt" "@MIT_SCHEME_PROJECT@"'; \ echo ' ""'; \ - echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' ""'; \ echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -install-info-am: - -uninstall-info-am: - uninstall-hook: ( echo '(remove-plugin "mcrypt" "@MIT_SCHEME_PROJECT@"'; \ echo ' ""'; \ diff --git a/src/pgsql/Makefile.am b/src/pgsql/Makefile.am index 540f91651..e450ed4a2 100644 --- a/src/pgsql/Makefile.am +++ b/src/pgsql/Makefile.am @@ -5,19 +5,19 @@ ## 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, ## 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of ## Technology -## +## ## This file is part of MIT/GNU Scheme. -## +## ## MIT/GNU Scheme 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. -## +## ## MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, @@ -47,11 +47,11 @@ scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ AM_CFLAGS = @MIT_CFLAGS@ `pkg-config --cflags libpq` -LIBS = `pkg-config --libs libpq` +AM_LIBS = `pkg-config --libs libpq` pgsql_shim_la_LDFLAGS = -module -avoid-version -shared -noinst_PROGRAMS = pgsql-const +noinst_PROGRAMS = pgsql-const$(EXEEXT) pgsql_const_SOURCES = pgsql-const.c pgsql-shim.h pgsql-shim.c: stamp-shim @@ -65,7 +65,7 @@ stamp-shim: pgsql-shim.h $(cdecls) pgsql-const.bin: pgsql-const.scm echo '(sf "pgsql-const")' | $(MIT_SCHEME_EXE) --batch-mode -pgsql-const.scm: pgsql-const +pgsql-const.scm: pgsql-const$(EXEEXT) ./pgsql-const @MIT_SCHEME_DEPS@ @@ -73,6 +73,11 @@ stamp-scheme: stamp-shim $(sources) pgsql.pkg MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh echo "done" > $@ +MOSTLYCLEANFILES = $(scmlib_LTLIBRARIES) pgsql-const$(EXEEXT) + +mostlyclean-local: + -rm -rf .libs + CLEANFILES = pgsql-const* pgsql-shim.c CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd CLEANFILES += stamp-shim stamp-scheme @@ -84,11 +89,10 @@ CLEANFILES += pgsql-check.db tags: tags-am ./tags-fix.sh pgsql -all_sources = $(sources) -ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) -TAGS_DEPENDENCIES = $(all_sources) $(cdecls) +TAGS_FILES = $(sources) $(cdecls) -EXTRA_DIST += $(all_sources) $(cdecls) compile.scm pgsql.pkg +EXTRA_DIST += $(sources) $(cdecls) +EXTRA_DIST += compile.sh compile.scm pgsql.pkg EXTRA_DIST += pgsql-check.scm pgsql-check.sh EXTRA_DIST += make.scm optiondb.scm tags-fix.sh @@ -96,20 +100,16 @@ install-data-hook: ( echo '(add-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \ echo ' ""'; \ echo ' "$(DESTDIR)$(scmlibdir)"'; \ - echo ' "$(DESTDIR)$(scmdocdir)")' ) \ + echo ' "")' ) \ | $(MIT_SCHEME_EXE) --batch-mode install-html: install-html-am ( echo '(add-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \ echo ' ""'; \ - echo ' "$(DESTDIR)$(scmlibdir)"'; \ + echo ' ""'; \ echo ' "$(DESTDIR)$(scmdocdir)")' ) \ | $(MIT_SCHEME_EXE) --batch-mode -install-info-am: - -uninstall-info-am: - uninstall-hook: ( echo '(remove-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \ echo ' ""'; \ diff --git a/src/x11-screen/Makefile.am b/src/x11-screen/Makefile.am index 451b4f151..8a6dfea36 100644 --- a/src/x11-screen/Makefile.am +++ b/src/x11-screen/Makefile.am @@ -6,22 +6,22 @@ ## 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of ## Technology ## -## This file is part of an X11-screen plugin for MIT/GNU Scheme. +## This file is part of MIT/GNU Scheme. ## -## 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. +## MIT/GNU Scheme 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 +## MIT/GNU Scheme 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. +## along with MIT/GNU Scheme; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, +## USA. EXTRA_DIST = autogen.sh @@ -51,19 +51,8 @@ CLEANFILES += @MIT_SCHEME_CLEAN@ TESTS = x11-screen-check.sh -ETAGS_ARGS = $(sources) -TAGS_DEPENDENCIES = $(sources) +TAGS_FILES = $(sources) EXTRA_DIST += $(sources) compile.sh x11-screen.pkg EXTRA_DIST += x11-screen-check.sh x11-screen-test.scm EXTRA_DIST += make.scm optiondb.scm compile.scm - -install-data-hook: - -install-html: install-html-am - -install-info-am: - -uninstall-info-am: - -uninstall-hook: diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am index 38b921728..eacb6f134 100644 --- a/src/x11/Makefile.am +++ b/src/x11/Makefile.am @@ -6,22 +6,22 @@ ## 2015, 2016, 2017, 2018, 2019 Massachusetts Institute of ## Technology ## -## This file is part of an x11 plugin for MIT/GNU Scheme. +## This file is part of MIT/GNU Scheme. ## -## 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. +## MIT/GNU Scheme 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 +## MIT/GNU Scheme 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. +## along with MIT/GNU Scheme; 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 @@ -53,13 +53,13 @@ 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 +noinst_PROGRAMS = x11-const$(EXEEXT) x11_const_SOURCES = x11-const.c x11-shim.h x11.h x11-shim.c: stamp-shim x11-const.c: stamp-shim x11-types.bin: stamp-shim -stamp-shim: $(c_sources) $(cdecls) +stamp-shim: x11-shim.h x11.h $(cdecls) echo '(generate-shim "x11" "#include \"x11-shim.h\"")' \ | $(MIT_SCHEME_EXE) --batch-mode echo "done" > $@ @@ -71,11 +71,11 @@ x11-const.scm: x11-const$(EXEEXT) ./x11-const @MIT_SCHEME_DEPS@ -stamp-scheme: stamp-shim $(sources) x11-const.bin x11.pkg +stamp-scheme: stamp-shim $(sources) x11.pkg MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh echo "done" > $@ -MOSTLYCLEANFILES = $(scmlib_LTLIBRARIES) x11-const +MOSTLYCLEANFILES = $(scmlib_LTLIBRARIES) x11-const$(EXEEXT) mostlyclean-local: -rm -rf .libs @@ -90,10 +90,9 @@ TESTS = x11-check.sh tags: tags-am ./tags-fix.sh x11 -all_sources = $(sources) $(c_sources) -ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) -TAGS_DEPENDENCIES = $(all_sources) $(cdecls) +TAGS_FILES = $(sources) $(cdecls) -EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm x11.pkg +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