diff options
author | Paul Smith <psmith@nuodb.com> | 2018-07-01 12:28:25 -0400 |
---|---|---|
committer | Paul Smith <psmith@gnu.org> | 2018-07-02 07:54:07 -0400 |
commit | 63b42fa235835cbeac6c1b9182f32798ea135dfd (patch) | |
tree | 69d0ded9d9a149842a889360987ab42cf6372a1f /build_w32.bat | |
parent | a7b0dfddac435eab6017f99f8f5cb18860fb90ac (diff) | |
download | make-git-63b42fa235835cbeac6c1b9182f32798ea135dfd.tar.gz |
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
Diffstat (limited to 'build_w32.bat')
-rwxr-xr-x | build_w32.bat | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/build_w32.bat b/build_w32.bat index fcfd7c69..ab67a642 100755 --- a/build_w32.bat +++ b/build_w32.bat @@ -179,7 +179,7 @@ mkdir %OUTDIR%\src mkdir %OUTDIR%\src\w32
mkdir %OUTDIR%\src\w32\compat
mkdir %OUTDIR%\src\w32\subproc
-mkdir %OUTDIR%\glob
+mkdir %OUTDIR%\lib
if "%GUILE%" == "Y" call :ChkGuile
@@ -189,6 +189,9 @@ echo Compiling %OUTDIR% version if exist src\config.h.W32.template call :ConfigSCM
copy src\config.h.W32 %OUTDIR%\src\config.h
+copy lib\glob.in.h %OUTDIR%\lib\glob.h
+copy lib\fnmatch.in.h %OUTDIR%\lib\fnmatch.h
+
if exist %OUTDIR%\link.sc del %OUTDIR%\link.sc
call :Compile src\ar
@@ -199,7 +202,6 @@ call :Compile src\dir call :Compile src\expand
call :Compile src\file
call :Compile src\function
-call :Compile src\getloadavg
call :Compile src\getopt
call :Compile src\getopt1
call :Compile src\guile GUILE
@@ -226,8 +228,9 @@ call :Compile src\w32\compat\posixfcn call :Compile src\w32\subproc\misc
call :Compile src\w32\subproc\sub_proc
call :Compile src\w32\subproc\w32err
-call :Compile glob\fnmatch
-call :Compile glob\glob
+call :Compile lib\fnmatch
+call :Compile lib\glob
+call :Compile lib\getloadavg
if not "%COMPILER%" == "gcc" call :Compile src\w32\compat\dirent
@@ -257,14 +260,14 @@ if "%COMPILER%" == "gcc" goto GccCompile :: MSVC Compile
echo on
-%COMPILER% /nologo /MT /W4 /EHsc %OPTS% /I %OUTDIR%/src /I src /I glob /I src/w32/include /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR%OUTDIR% /Fp%OUTDIR%\%MAKE%.pch /Fo%OUTDIR%\%1.%O% /Fd%OUTDIR%\%MAKE%.pdb %EXTRAS% /c %1.c
+%COMPILER% /nologo /MT /W4 /EHsc %OPTS% /I %OUTDIR%/src /I src /I %OUTDIR%/lib /I lib /I src/w32/include /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /FR%OUTDIR% /Fp%OUTDIR%\%MAKE%.pch /Fo%OUTDIR%\%1.%O% /Fd%OUTDIR%\%MAKE%.pdb %EXTRAS% /c %1.c
@echo off
goto CompileDone
:GccCompile
:: GCC Compile
echo on
-%COMPILER% -mthreads -Wall -std=gnu99 -gdwarf-2 -g3 %OPTS% -I%OUTDIR%/src -I./src -I./glob -I./src/w32/include -DWINDOWS32 -DHAVE_CONFIG_H %EXTRAS% -o %OUTDIR%\%1.%O% -c %1.c
+%COMPILER% -mthreads -Wall -std=gnu99 -gdwarf-2 -g3 %OPTS% -I%OUTDIR%/src -I./src -I%OUTDIR%/lib -I./lib -I./src/w32/include -DWINDOWS32 -DHAVE_CONFIG_H %EXTRAS% -o %OUTDIR%\%1.%O% -c %1.c
@echo off
:CompileDone
|