From 63b42fa235835cbeac6c1b9182f32798ea135dfd Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 1 Jul 2018 12:28:25 -0400 Subject: Convert GNU make to use the gnulib portability library Move content from glob/* and config/* into standard GNU directory locations lib/* and m4/*. Install the gnulib bootstrap script and its configuration file, and create a bootstrap.bat file for Windows. Update the README.git file with new requirements and instructions for building from Git. At this point we only install the alloca, getloadavg, and FDL modules from gnulib. We keep our old glob/fnmatch implementation since the gnulib versions require significant amounts of infrastructure which doesn't exist on Windows yet. Further work is required here. Due to a problem with gnulib's version of getloadavg, we need to bump the minimum required version of automake to 1.16.1 unfortunately. * README.git: Update instructions * NEWS: Move developer news to a separate section * configure.ac: Update for use with gnulib modules * bootstrap: Bootstrap from Git workspace (import from gnulib) * bootstrap.conf: Bootstrap configuration for GNU make * bootstrap.bat: Bootstrap from Git workspace for Windows * gl/modules/make-glob: Support our local fnmatch/glob implementation * config/acinclude.m4: Move to m4/ * config/dospaths.m4: Move to m4/ * glob/fnmatch.c: Move to lib/ * glob/fnmatch.h.in: Move to lib/ * glob/glob.c: Move to lib/ * glob/glob.h.in: Move to lib/ * Makefile.am: Update for new directories * build.template: Update for new directories * build_w32.bat: Update for new directories * builddos.bat: Update for new directories * maintMakefile: Update for new directories * makefile.com: Update for new directories * mk/Amiga.mk: Update for new directories * mk/Posix.mk.in: Update for new directories * mk/VMS.mk: Update for new directories * mk/Windows32.mk: Update for new directories * mk/msdosdjgpp.mk: Update for new directories * po/LINGUAS: One language per line (needed by gnulib) * INSTALL: Remove (obtained from gnulib) * src/alloca.c: Remove (obtained from gnulib) * src/getloadavg.c: Remove (obtained from gnulib) * po/Makevars: Remove (created by bootstrap) * config/*: Remove leftover files * glob/*: Remove leftover files --- makefile.com | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'makefile.com') diff --git a/makefile.com b/makefile.com index 96cd5ae5..a65ca9da 100644 --- a/makefile.com +++ b/makefile.com @@ -71,14 +71,19 @@ $ if (p3.nes."WALL") $ then $ gosub check_cc_qual $ endif -$ filelist = "alloca ar arscan commands default dir expand file function " + - - "guile hash implicit job load main misc read remake " + - - "remote-stub rule output signame variable version " + - - "vmsfunctions vmsify vpath vms_progname vms_exit " + - - "vms_export_symbol [.glob]glob [.glob]fnmatch getopt1 " + - - "getopt strcache" -$! -$ copy config.h-vms config.h +$ filelist = "[.src]ar [.src]arscan [.src]commands [.src]default [.src]dir " + - + "[.src]expand [.src]file [.src]function [.src]guile " + - + "[.src]hash [.src]implicit [.src]job [.src]load [.src]main " + - + "[.src]misc [.src]read [.src]remake [.src]remote-stub " + - + "[.src]rule [.src]output [.src]signame [.src]variable " + - + "[.src]version [.src]strcache [.src]vpath " + - + "[.src]vmsfunctions [.src]vmsify [.src]vms_progname " + - + "[.src]vms_exit [.src]vms_export_symbol " + - + "[.lib]alloca [.lib]fnmatch [.lib]glob [.src]getopt1 [.src]getopt" +$! +$ copy [.src]config.h-vms [.src]config.h +$ copy [.lib]fnmatch.in.h [.lib]fnmatch.h +$ copy [.lib]glob.in.h [.lib]glob.h $ n=0 $ open/write optf make.opt $ loop: @@ -141,7 +146,7 @@ $ else $ objdir := [] $ write optf objdir+p1 $ endif -$ cc'ccopt'/nested=none/include=([],[.glob])/obj='objdir' - +$ cc'ccopt'/nested=none/include=([],[.src],[.lib])/obj='objdir' - /define=("allocated_variable_expand_for_file=alloc_var_expand_for_file",- "unlink=remove","HAVE_CONFIG_H","VMS") - 'p1' -- cgit v1.2.1