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).
## 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,
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
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@
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
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
#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:
## 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,
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
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@
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
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
#TESTS = imail-check.sh
-ETAGS_ARGS = $(sources)
-TAGS_DEPENDENCIES = $(sources)
+TAGS_FILES = $(sources)
EXTRA_DIST += $(sources) compile.sh make.scm compile.scm imail.pkg
## 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,
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
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@
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
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
( 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 ' ""'; \
## 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,
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
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@
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
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
( 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 ' ""'; \
## 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
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:
## 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
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" > $@
./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
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
projects / mit-scheme.git / commitdiff