diff options
| author | Paul Smith <psmith@gnu.org> | 2022-10-16 15:13:41 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-10-18 14:20:44 -0400 |
| commit | 2d943d3d2e5b69d6b635314a46d20e55cfbd255a (patch) | |
| tree | eb272d7661251ee0aecdf5357519c734110cbea1 /Basic.mk.template | |
| parent | b16913a67e1d0f651293d24f10ccca54a8cc0d08 (diff) | |
| download | make-git-2d943d3d2e5b69d6b635314a46d20e55cfbd255a.tar.gz | |
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.
Diffstat (limited to 'Basic.mk.template')
| -rw-r--r-- | Basic.mk.template | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Basic.mk.template b/Basic.mk.template index d529361a..9d842f5c 100644 --- a/Basic.mk.template +++ b/Basic.mk.template @@ -39,7 +39,6 @@ w32_SOURCES = %w32_SOURCES% vms_SOURCES = %vms_SOURCES% amiga_SOURCES = %amiga_SOURCES% -posix_SOURCES = $(src)posixos.c remote_SOURCES = $(src)remote-stub.c OUTDIR = @@ -104,9 +103,7 @@ CP.cmd = cp $1 $2 CLEANSPACE = $(call RM.cmd,$(OBJECTS) $(PROG) $(BUILT_SOURCES)) # Load overrides for the above variables. -include $(firstword $(wildcard $(SRCDIR)/mk/$(lastword $(subst -, ,$(MAKE_HOST)).mk) $(OUTDIR)mk/Posix.mk $(SRCDIR)/mk/Posix.mk)) - -VERSION = %VERSION% +include $(firstword $(wildcard $(SRCDIR)/mk/$(lastword $(subst -, ,$(MAKE_HOST)).mk))) VPATH = $(SRCDIR) |