"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "makefile" between
FreeBASIC-1.07.0-source.tar.gz and FreeBASIC-1.07.1-source.tar.gz

About: FreeBasic is a set of cross-platform development tools consisting of a compiler, GNU-based assembler, linker and archiver, and supporting runtime libraries, including a software-based graphics library.

makefile  (FreeBASIC-1.07.0-source):makefile  (FreeBASIC-1.07.1-source)
skipping to change at line 86 skipping to change at line 86
# MULTILIB "32", "64" or empty for cross-compiling using a gcc multili b toolchain # MULTILIB "32", "64" or empty for cross-compiling using a gcc multili b toolchain
# FBC, CC, AR fbc, gcc, ar programs (TARGET may be prefixed to CC/AR) # FBC, CC, AR fbc, gcc, ar programs (TARGET may be prefixed to CC/AR)
# V=1 to see full command lines # V=1 to see full command lines
# ENABLE_STANDALONE=1 build source tree into self-contained FB installation # ENABLE_STANDALONE=1 build source tree into self-contained FB installation
# ENABLE_PREFIX=1 use "-d ENABLE_PREFIX=$(prefix)" to hard-code the pre fix into fbc # ENABLE_PREFIX=1 use "-d ENABLE_PREFIX=$(prefix)" to hard-code the pre fix into fbc
# ENABLE_SUFFIX=-0.24 append a string like "-0.24" to fbc/FB dir names, # ENABLE_SUFFIX=-0.24 append a string like "-0.24" to fbc/FB dir names,
# and use "-d ENABLE_SUFFIX=$(ENABLE_SUFFIX)" (non-stan dalone only) # and use "-d ENABLE_SUFFIX=$(ENABLE_SUFFIX)" (non-stan dalone only)
# ENABLE_LIB64=1 use prefix/lib64/ instead of prefix/lib/ for 64bit li bs (non-standalone only) # ENABLE_LIB64=1 use prefix/lib64/ instead of prefix/lib/ for 64bit li bs (non-standalone only)
# ENABLE_STRIPALL=1 use "-d ENABLE_STRIPALL" with all targets # ENABLE_STRIPALL=1 use "-d ENABLE_STRIPALL" with all targets
# ENABLE_STRIPALL=0 disable "-d ENABLE_STRIPALL" with all targets # ENABLE_STRIPALL=0 disable "-d ENABLE_STRIPALL" with all targets
# FBSHA1=1 determine the sha-1 of the current commit in repo and
store it in the compiler
# FBSHA1=some-sha-1 explicitly indicate the sha-1 to store in the compile
r
# FBPACKAGE bindist: The package/archive file name without path or extensi on # FBPACKAGE bindist: The package/archive file name without path or extensi on
# FBPACKSUFFIX bindist: Allows adding a custom suffix to the normal package n ame (and the toplevel dir in the archive) # FBPACKSUFFIX bindist: Allows adding a custom suffix to the normal package n ame (and the toplevel dir in the archive)
# FBMANIFEST bindist: The manifest file name without path or extension # FBMANIFEST bindist: The manifest file name without path or extension
# FBVERSION bindist/gitdist: FB version number # FBVERSION bindist/gitdist: FB version number
# DISABLE_DOCS bindist: Don't package readme/changelog/manpage/examples # DISABLE_DOCS bindist: Don't package readme/changelog/manpage/examples
# #
# compiler source code configuration (FBCFLAGS): # compiler source code configuration (FBCFLAGS):
# -d ENABLE_STANDALONE build for a self-contained installation # -d ENABLE_STANDALONE build for a self-contained installation
# -d ENABLE_SUFFIX=-0.24 assume FB's lib dir uses the given suffix (non-stan dalone only) # -d ENABLE_SUFFIX=-0.24 assume FB's lib dir uses the given suffix (non-stan dalone only)
# -d ENABLE_PREFIX=/some/path hard-code specific $(prefix) into fbc # -d ENABLE_PREFIX=/some/path hard-code specific $(prefix) into fbc
# -d ENABLE_LIB64 use prefix/lib64/ instead of prefix/lib/ for 64bit libs (non-standalone only) # -d ENABLE_LIB64 use prefix/lib64/ instead of prefix/lib/ for 64bit libs (non-standalone only)
# -d ENABLE_STRIPALL configure fbc to pass down '--strip-all' to linker by default # -d ENABLE_STRIPALL configure fbc to pass down '--strip-all' to linker by default
# -d FBSHA1=some-sha-1 store 'some-sha-1' in the compiler for version info rmation
# #
# rtlib/gfxlib2 source code configuration (CFLAGS): # rtlib/gfxlib2 source code configuration (CFLAGS):
# -DDISABLE_X11 build without X11 headers (disables X11 gfx driver) # -DDISABLE_X11 build without X11 headers (disables X11 gfx driver)
# -DDISABLE_GPM build without gpm.h (disables Linux GetMouse) # -DDISABLE_GPM build without gpm.h (disables Linux GetMouse)
# -DDISABLE_FFI build without ffi.h (disables ThreadCall) # -DDISABLE_FFI build without ffi.h (disables ThreadCall)
# -DDISABLE_OPENGL build without OpenGL headers (disables OpenGL gfx drivers) # -DDISABLE_OPENGL build without OpenGL headers (disables OpenGL gfx drivers)
# -DDISABLE_FBDEV build without Linux framebuffer device headers (disables Li nux fbdev gfx driver) # -DDISABLE_FBDEV build without Linux framebuffer device headers (disables Li nux fbdev gfx driver)
# #
# makefile variables may either be set on the make command line, # makefile variables may either be set on the make command line,
# or (in a more permanent way) inside a 'config.mk' file. # or (in a more permanent way) inside a 'config.mk' file.
skipping to change at line 209 skipping to change at line 212
ifneq ($(findstring CYGWIN,$(uname)),) ifneq ($(findstring CYGWIN,$(uname)),)
TARGET_OS := cygwin TARGET_OS := cygwin
else ifeq ($(uname),Darwin) else ifeq ($(uname),Darwin)
TARGET_OS := darwin TARGET_OS := darwin
else ifeq ($(uname),FreeBSD) else ifeq ($(uname),FreeBSD)
TARGET_OS := freebsd TARGET_OS := freebsd
else ifeq ($(uname),Linux) else ifeq ($(uname),Linux)
TARGET_OS := linux TARGET_OS := linux
else ifneq ($(findstring MINGW,$(uname)),) else ifneq ($(findstring MINGW,$(uname)),)
TARGET_OS := win32 TARGET_OS := win32
else ifneq ($(findstring MSYS_NT,$(uname)),) else ifneq ($(findstring MSYS_NT,$(uname)),)
TARGET_OS := win32 TARGET_OS := win32
else ifeq ($(uname),MS-DOS) else ifeq ($(uname),MS-DOS)
TARGET_OS := dos TARGET_OS := dos
else ifeq ($(uname),NetBSD) else ifeq ($(uname),NetBSD)
TARGET_OS := netbsd TARGET_OS := netbsd
else ifeq ($(uname),OpenBSD) else ifeq ($(uname),OpenBSD)
TARGET_OS := openbsd TARGET_OS := openbsd
else ifeq ($(uname),SunOS) else ifeq ($(uname),SunOS)
TARGET_OS := solaris TARGET_OS := solaris
endif endif
endif endif
ifndef TARGET_ARCH ifndef TARGET_ARCH
# For DJGPP, always use x86 (DJGPP's uname -m returns just "pc") # For DJGPP, always use x86 (DJGPP's uname -m returns just "pc")
ifeq ($(TARGET_OS),dos) ifeq ($(TARGET_OS),dos)
TARGET_ARCH := x86 TARGET_ARCH := x86
# For MSYS2, use default compilers (uname -m returns MSYS2's shell
# architecture). For example, from win 7:
#
# host shell uname -s -m default gcc target
# ------ ------- -------------------- ------------------
# msys32 msys2 MSYS_NT-6.1-WOW i686 n/a
# msys32 mingw32 MINGW32_NT-6.1-WOW i686 i686-w64-mingw32
# msys32 mingw64 MINGW64_NT-6.1-WOW i686 x86_64-w64-mingw32
# msys64 msys2 MSYS_NT-6.1 x86_64 n/a
# msys64 mingw32 MINGW32_NT-6.1 x86_64 i686-w64-mingw32
# msys64 mingw64 MINGW64_NT-6.1 x86_64 x86_64-w64-mingw32
#
else ifneq ($(findstring MINGW32,$(uname)),)
TARGET_ARCH := x86
else ifneq ($(findstring MINGW64,$(uname)),)
TARGET_ARCH := x86_64
# anything, trust 'uname -m', we have no other choice
else else
TARGET_ARCH = $(shell uname -m) TARGET_ARCH = $(shell uname -m)
endif endif
endif endif
endif endif
ifndef TARGET_OS ifndef TARGET_OS
$(error couldn't identify TARGET_OS automatically) $(error couldn't identify TARGET_OS automatically)
endif endif
ifndef TARGET_ARCH ifndef TARGET_ARCH
skipping to change at line 426 skipping to change at line 448
ifneq ($(filter cygwin win32,$(TARGET_OS)),) ifneq ($(filter cygwin win32,$(TARGET_OS)),)
# Increase compiler's available stack size, it uses lots of recursion # Increase compiler's available stack size, it uses lots of recursion
ALLFBLFLAGS += -t 2048 ALLFBLFLAGS += -t 2048
endif endif
# Pass the configuration defines on to the compiler source code # Pass the configuration defines on to the compiler source code
ifdef ENABLE_STANDALONE ifdef ENABLE_STANDALONE
ALLFBCFLAGS += -d ENABLE_STANDALONE ALLFBCFLAGS += -d ENABLE_STANDALONE
endif endif
ifdef FBSHA1
ifeq ($(FBSHA1),1)
ALLFBCFLAGS += -d 'FBSHA1="$(shell git rev-parse HEAD)"'
else
ALLFBCFLAGS += -d 'FBSHA1="$(FBSHA1)"'
endif
endif
ifdef ENABLE_SUFFIX ifdef ENABLE_SUFFIX
ALLFBCFLAGS += -d 'ENABLE_SUFFIX="$(ENABLE_SUFFIX)"' ALLFBCFLAGS += -d 'ENABLE_SUFFIX="$(ENABLE_SUFFIX)"'
endif endif
ifdef ENABLE_PREFIX ifdef ENABLE_PREFIX
ALLFBCFLAGS += -d 'ENABLE_PREFIX="$(prefix)"' ALLFBCFLAGS += -d 'ENABLE_PREFIX="$(prefix)"'
endif endif
ifdef ENABLE_LIB64 ifdef ENABLE_LIB64
ALLFBCFLAGS += -d ENABLE_LIB64 ALLFBCFLAGS += -d ENABLE_LIB64
endif endif
ifdef ENABLE_STRIPALL ifdef ENABLE_STRIPALL
skipping to change at line 1053 skipping to change at line 1082
# tree, so that it's safe to link the bootstrapped fbc against it. This way # tree, so that it's safe to link the bootstrapped fbc against it. This way
# there's no need to worry about choosing the right rtlib when bootstrapping # there's no need to worry about choosing the right rtlib when bootstrapping
# fbc -- it's just always possible to use the version from the same source tree. # fbc -- it's just always possible to use the version from the same source tree.
# #
FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap FBBOOTSTRAPTITLE := $(FBSOURCETITLE)-bootstrap
.PHONY: bootstrap-dist .PHONY: bootstrap-dist
bootstrap-dist: bootstrap-dist:
# Precompile fbc sources for various targets # Precompile fbc sources for various targets
rm -rf bootstrap rm -rf bootstrap
mkdir -p bootstrap/dos mkdir -p bootstrap/dos
mkdir -p bootstrap/freebsd-x86
mkdir -p bootstrap/freebsd-x86_64
mkdir -p bootstrap/linux-x86 mkdir -p bootstrap/linux-x86
mkdir -p bootstrap/linux-x86_64 mkdir -p bootstrap/linux-x86_64
mkdir -p bootstrap/win32 mkdir -p bootstrap/win32
mkdir -p bootstrap/win64 mkdir -p bootstrap/win64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target dos ./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target dos
&& mv src/compiler/*.asm bootstrap/dos && mv src/compiler/*.asm bootstrap/dos
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86 ./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-x8
&& mv src/compiler/*.asm bootstrap/linux-x86 6 && mv src/compiler/*.asm bootstrap/freebsd-x86
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86_ ./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-x8
64 && mv src/compiler/*.c bootstrap/linux-x86_64 6_64 && mv src/compiler/*.c bootstrap/freebsd-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win32 ./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86
&& mv src/compiler/*.asm bootstrap/win32 && mv src/compiler/*.asm bootstrap/linux-x86
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win64 ./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86_
&& mv src/compiler/*.c bootstrap/win64 64 && mv src/compiler/*.c bootstrap/linux-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win32
&& mv src/compiler/*.asm bootstrap/win32
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win64
&& mv src/compiler/*.c bootstrap/win64
# Ensure to have LFs regardless of host system (LFs will probably work # Ensure to have LFs regardless of host system (LFs will probably work
# on DOS/Win32, but CRLFs could cause issues on Linux) # on DOS/Win32, but CRLFs could cause issues on Linux)
dos2unix bootstrap/dos/* dos2unix bootstrap/dos/*
dos2unix bootstrap/freebsd-x86/*
dos2unix bootstrap/freebsd-x86_64/*
dos2unix bootstrap/linux-x86/* dos2unix bootstrap/linux-x86/*
dos2unix bootstrap/linux-x86_64/* dos2unix bootstrap/linux-x86_64/*
dos2unix bootstrap/win32/* dos2unix bootstrap/win32/*
dos2unix bootstrap/win64/* dos2unix bootstrap/win64/*
# Package FB sources (similar to our "gitdist" command), and add the boot strap/ directory # Package FB sources (similar to our "gitdist" command), and add the boot strap/ directory
# Making a .tar.xz should be good enough for now. # Making a .tar.xz should be good enough for now.
git -c core.autocrlf=false archive --format tar --prefix "$(FBBOOTSTRAPTI TLE)/" HEAD | tar xf - git -c core.autocrlf=false archive --format tar --prefix "$(FBBOOTSTRAPTI TLE)/" HEAD | tar xf -
mv bootstrap $(FBBOOTSTRAPTITLE) mv bootstrap $(FBBOOTSTRAPTITLE)
tar -cJf "$(FBBOOTSTRAPTITLE).tar.xz" "$(FBBOOTSTRAPTITLE)" tar -cJf "$(FBBOOTSTRAPTITLE).tar.xz" "$(FBBOOTSTRAPTITLE)"
 End of changes. 8 change blocks. 
11 lines changed or deleted 50 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)