From 2d943d3d2e5b69d6b635314a46d20e55cfbd255a Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 16 Oct 2022 15:13:41 -0400 Subject: Remove template files to simplify distribution creation The README templates were not useful since the replacement step didn't have anything to replace: rename them. Rather than creating template files for the config variants, create mkconfig.h.in containg PACKAGE_* variables to be replaced, and have config variant header files include it. Note on POSIX we don't use this, and continue to generate a single config.h.in file. Use config.status to convert the README.in and mkconfig.h.in files during distribution creation. Modify all users of VERSION to use PACKAGE_VERSION instead. * configure.ac: Use GNU Make not GNU make as the package name. * README.in: Use GNU Make not GNU make. * README.git: Remove references to README.W32.template. * .gitignore: Update for new behavior. * Basic.mk.template: Remove unused posix_SOURCES and VERSION, and references to unshipped mk/Posix.mk * Makefile.am: Add src/mkconfig.h as an extra dist file. * bootstrap.bat: Rewrite mkconfig.h.in to mkconfig.h * maintMakefile: Remove obsolete template files; add mkconfig.h.in. * prepare_vms.com: Rewrite mkconfig.h.in to mkconfig.h * mk/VMS.mk: Fix incorrect header file prerequisite. * src/mkconfig.h.in: New file containing PACKAGE variables. * src/config.ami: Include mkconfig.h. * src/config.h.W32: Ditto. * src/configh.dos: Ditto. * src/config.h-vms: Ditto. * src/version.c: Use PACKAGE_VERSION not VERSION. --- mk/Posix.mk.in | 2 +- mk/VMS.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/Posix.mk.in b/mk/Posix.mk.in index d3101700..a0d12ed6 100644 --- a/mk/Posix.mk.in +++ b/mk/Posix.mk.in @@ -20,7 +20,7 @@ # Very little is needed here since the default Basic.mk assumes POSIX -prog_SOURCES += $(posix_SOURCES) +prog_SOURCES += $(src)/posixos.c extra_CPPFLAGS += @GUILE_CFLAGS@ extra_LDFLAGS += @AM_LDFLAGS@ diff --git a/mk/VMS.mk b/mk/VMS.mk index 5002a5ac..b4d982ad 100644 --- a/mk/VMS.mk +++ b/mk/VMS.mk @@ -93,5 +93,5 @@ define CLEANSPACE endef -$(OUTDIR)$(src)config.h: $(SRCDIR)$(src)config.h.W32 +$(OUTDIR)$(src)config.h: $(SRCDIR)$(src)config.h-vms $(call CP.cmd,$<,$@) -- cgit v1.2.1