diff options
| -rw-r--r-- | Makefile.in | 94 | ||||
| -rw-r--r-- | project/defs.mk | 50 | ||||
| -rw-r--r-- | sysinfo/host/i686-nt32-midipix.mk | 4 | ||||
| -rw-r--r-- | sysinfo/host/i686-unknown-linux.mk | 4 | ||||
| -rw-r--r-- | sysinfo/host/i686-w64-mingw32.mk | 4 | ||||
| -rw-r--r-- | sysinfo/host/x86_64-nt64-midipix.mk | 4 | ||||
| -rw-r--r-- | sysinfo/host/x86_64-unknown-linux.mk | 4 | ||||
| -rw-r--r-- | sysinfo/host/x86_64-w64-mingw32.mk | 4 | ||||
| -rw-r--r-- | sysinfo/os/bsd.mk | 14 | ||||
| -rw-r--r-- | sysinfo/os/linux.mk | 14 | ||||
| -rw-r--r-- | sysinfo/os/midipix.mk | 14 | ||||
| -rw-r--r-- | sysinfo/os/mingw.mk | 14 | ||||
| -rw-r--r-- | sysinfo/toolchain/clang.mk | 2 | ||||
| -rw-r--r-- | sysinfo/toolchain/gcc.mk | 2 |
14 files changed, 114 insertions, 114 deletions
diff --git a/Makefile.in b/Makefile.in index 3c5f40a..26365b4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,50 +1,50 @@ -PACKAGE ?= @package@ -PROJECT_DIR ?= @project_dir@ - -BUILD ?= @build@ -HOST ?= @host@ -TARGET ?= @target@ -ARCH ?= @arch@ -TOOLCHAIN ?= @toolchain@ -SYSROOT ?= @sysroot@ -CROSS_COMPILE ?= @cross_compile@ -SHELL ?= @shell@ - -CFLAGS_DEBUG ?= @cflags_debug@ -CFLAGS_COMMON ?= @cflags_common@ -CFLAGS_CMDLINE ?= @cflags_cmdline@ -CFLAGS_CONFIG ?= @cflags_config@ -CFLAGS_SYSROOT ?= @cflags_sysroot@ -CFLAGS_PATH ?= @cflags_path@ - -LDFLAGS_DEBUG ?= @ldflags_debug@ -LDFLAGS_COMMON ?= @ldflags_common@ -LDFLAGS_CMDLINE ?= @ldflags_cmdline@ -LDFLAGS_CONFIG ?= @ldflags_config@ -LDFLAGS_SYSROOT ?= @ldflags_sysroot@ -LDFLAGS_PATH ?= @ldflags_path@ - -PE_SUBSYSTEM ?= @pe_subsystem@ -PE_IMAGE_BASE ?= @pe_image_base@ -PE_CONFIG_DEFS ?= @pe_config_defs@ - -ELF_EH_FRAME ?= @elf_eh_frame@ -ELF_HASH_STYLE ?= @elf_hash_style@ -ELF_CONFIG_DEFS ?= @elf_config_defs@ - -PREFIX ?= @prefix@ -BIN_DIR ?= @bindir@ -LIB_DIR ?= @libdir@ -INCLUDE_DIR ?= @includedir@ -SYSLIB_DIR ?= @syslibdir@ -MAN_DIR ?= @mandir@ -DOC_DIR ?= @docdir@ -LIBEXEC_DIR ?= @libexecdir@ - -BUILD_CC ?= @build_cc@ -BUILD_OS ?= @build_os@ -BUILD_OS_BITS ?= @build_os_bits@ -BUILD_OS_UNDERSCORE ?= @build_os_underscore@ +PACKAGE = @package@ +PROJECT_DIR = @project_dir@ + +BUILD = @build@ +HOST = @host@ +TARGET = @target@ +ARCH = @arch@ +TOOLCHAIN = @toolchain@ +SYSROOT = @sysroot@ +CROSS_COMPILE = @cross_compile@ +SHELL = @shell@ + +CFLAGS_DEBUG = @cflags_debug@ +CFLAGS_COMMON = @cflags_common@ +CFLAGS_CMDLINE = @cflags_cmdline@ +CFLAGS_CONFIG = @cflags_config@ +CFLAGS_SYSROOT = @cflags_sysroot@ +CFLAGS_PATH = @cflags_path@ + +LDFLAGS_DEBUG = @ldflags_debug@ +LDFLAGS_COMMON = @ldflags_common@ +LDFLAGS_CMDLINE = @ldflags_cmdline@ +LDFLAGS_CONFIG = @ldflags_config@ +LDFLAGS_SYSROOT = @ldflags_sysroot@ +LDFLAGS_PATH = @ldflags_path@ + +PE_SUBSYSTEM = @pe_subsystem@ +PE_IMAGE_BASE = @pe_image_base@ +PE_CONFIG_DEFS = @pe_config_defs@ + +ELF_EH_FRAME = @elf_eh_frame@ +ELF_HASH_STYLE = @elf_hash_style@ +ELF_CONFIG_DEFS = @elf_config_defs@ + +PREFIX = @prefix@ +BIN_DIR = @bindir@ +LIB_DIR = @libdir@ +INCLUDE_DIR = @includedir@ +SYSLIB_DIR = @syslibdir@ +MAN_DIR = @mandir@ +DOC_DIR = @docdir@ +LIBEXEC_DIR = @libexecdir@ + +BUILD_CC = @build_cc@ +BUILD_OS = @build_os@ +BUILD_OS_BITS = @build_os_bits@ +BUILD_OS_UNDERSCORE = @build_os_underscore@ diff --git a/project/defs.mk b/project/defs.mk index b3be937..9ca0cf8 100644 --- a/project/defs.mk +++ b/project/defs.mk @@ -1,44 +1,44 @@ -SHARED_LIB_DEPS ?= -SHARED_APP_DEPS ?= -STATIC_APP_DEPS ?= +SHARED_LIB_DEPS = +SHARED_APP_DEPS = +STATIC_APP_DEPS = -COMMON_LOBJS ?= $(COMMON_SRCS:.c=.lo) -COMMON_OBJS ?= $(COMMON_SRCS:.c=.o) +COMMON_LOBJS = $(COMMON_SRCS:.c=.lo) +COMMON_OBJS = $(COMMON_SRCS:.c=.o) -ARCH_LOBJS ?= $(ARCH_SRCS:.c=.lo) -ARCH_OBJS ?= $(ARCH_SRCS:.c=.o) +ARCH_LOBJS = $(ARCH_SRCS:.c=.lo) +ARCH_OBJS = $(ARCH_SRCS:.c=.o) -APP_LOBJS ?= $(APP_SRCS:.c=.lo) -APP_OBJS ?= $(APP_SRCS:.c=.o) +APP_LOBJS = $(APP_SRCS:.c=.lo) +APP_OBJS = $(APP_SRCS:.c=.o) -SHARED_OBJS ?= $(COMMON_LOBJS) $(ARCH_LOBJS) -STATIC_OBJS ?= $(COMMON_OBJS) $(ARCH_OBJS) +SHARED_OBJS = $(COMMON_LOBJS) $(ARCH_LOBJS) +STATIC_OBJS = $(COMMON_OBJS) $(ARCH_OBJS) -SHARED_LIB ?= $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX) -STATIC_LIB ?= $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT) -SHARED_IMPLIB ?= $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT) +SHARED_LIB = $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX) +STATIC_LIB = $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT) +SHARED_IMPLIB = $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT) -APP ?= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)$(OS_APP_SUFFIX) -DEFAULT_APP ?= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-default$(OS_APP_SUFFIX) -SHARED_APP ?= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-shared$(OS_APP_SUFFIX) -STATIC_APP ?= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX) +APP = $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)$(OS_APP_SUFFIX) +DEFAULT_APP = $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-default$(OS_APP_SUFFIX) +SHARED_APP = $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-shared$(OS_APP_SUFFIX) +STATIC_APP = $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX) -CFLAGS ?= $(CFLAGS_DEBUG) $(CFLAGS_CONFIG) $(CFLAGS_SYSROOT) \ +CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_CONFIG) $(CFLAGS_SYSROOT) \ $(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST) \ $(CFLAGS_PATH) -CFLAGS_SHARED ?= $(CFLAGS) $(CFLAGS_PIC) $(CFLAGS_SHARED_ATTR) -CFLAGS_STATIC ?= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_STATIC_ATTR) -CFLAGS_APP ?= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR) +CFLAGS_SHARED = $(CFLAGS) $(CFLAGS_PIC) $(CFLAGS_SHARED_ATTR) +CFLAGS_STATIC = $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_STATIC_ATTR) +CFLAGS_APP = $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR) -LDFLAGS_SHARED ?= $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ +LDFLAGS_SHARED = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(SHARED_LIB_DEPS) $(LDFLAGS_LAST) -LDFLAGS_APP ?= $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ +LDFLAGS_APP = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(SHARED_APP_DEPS) $(LDFLAGS_LAST) -LDFLAGS_STATIC ?= $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ +LDFLAGS_STATIC = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(STATIC_APP_DEPS) $(LDFLAGS_LAST) diff --git a/sysinfo/host/i686-nt32-midipix.mk b/sysinfo/host/i686-nt32-midipix.mk index 6ddc80f..7c3da66 100644 --- a/sysinfo/host/i686-nt32-midipix.mk +++ b/sysinfo/host/i686-nt32-midipix.mk @@ -1,4 +1,4 @@ include $(PROJECT_DIR)/sysinfo/os/midipix.mk -HOST_BITS ?= 32 -HOST_UNDERSCORE ?= '_' +HOST_BITS = 32 +HOST_UNDERSCORE = '_' diff --git a/sysinfo/host/i686-unknown-linux.mk b/sysinfo/host/i686-unknown-linux.mk index 6b3e3ee..ede5592 100644 --- a/sysinfo/host/i686-unknown-linux.mk +++ b/sysinfo/host/i686-unknown-linux.mk @@ -1,4 +1,4 @@ include $(PROJECT_DIR)/sysinfo/os/linux.mk -HOST_BITS ?= 32 -HOST_UNDERSCORE ?= '_' +HOST_BITS = 32 +HOST_UNDERSCORE = '_' diff --git a/sysinfo/host/i686-w64-mingw32.mk b/sysinfo/host/i686-w64-mingw32.mk index 27fd5d1..c9071d0 100644 --- a/sysinfo/host/i686-w64-mingw32.mk +++ b/sysinfo/host/i686-w64-mingw32.mk @@ -1,4 +1,4 @@ include $(PROJECT_DIR)/sysinfo/os/mingw.mk -HOST_BITS ?= 32 -HOST_UNDERSCORE ?= '_' +HOST_BITS = 32 +HOST_UNDERSCORE = '_' diff --git a/sysinfo/host/x86_64-nt64-midipix.mk b/sysinfo/host/x86_64-nt64-midipix.mk index 159b63f..48cf304 100644 --- a/sysinfo/host/x86_64-nt64-midipix.mk +++ b/sysinfo/host/x86_64-nt64-midipix.mk @@ -1,4 +1,4 @@ include $(PROJECT_DIR)/sysinfo/os/midipix.mk -HOST_BITS ?= 64 -HOST_UNDERSCORE ?= '' +HOST_BITS = 64 +HOST_UNDERSCORE = '' diff --git a/sysinfo/host/x86_64-unknown-linux.mk b/sysinfo/host/x86_64-unknown-linux.mk index 24974da..d00a62d 100644 --- a/sysinfo/host/x86_64-unknown-linux.mk +++ b/sysinfo/host/x86_64-unknown-linux.mk @@ -1,4 +1,4 @@ include $(PROJECT_DIR)/sysinfo/os/linux.mk -HOST_BITS ?= 64 -HOST_UNDERSCORE ?= '' +HOST_BITS = 64 +HOST_UNDERSCORE = '' diff --git a/sysinfo/host/x86_64-w64-mingw32.mk b/sysinfo/host/x86_64-w64-mingw32.mk index 8bbed5d..6ff9c83 100644 --- a/sysinfo/host/x86_64-w64-mingw32.mk +++ b/sysinfo/host/x86_64-w64-mingw32.mk @@ -1,4 +1,4 @@ include $(PROJECT_DIR)/sysinfo/os/mingw.mk -HOST_BITS ?= 64 -HOST_UNDERSCORE ?= '' +HOST_BITS = 64 +HOST_UNDERSCORE = '' diff --git a/sysinfo/os/bsd.mk b/sysinfo/os/bsd.mk index ed6edbb..158c44b 100644 --- a/sysinfo/os/bsd.mk +++ b/sysinfo/os/bsd.mk @@ -1,9 +1,9 @@ -OS_APP_PREFIX ?= -OS_APP_SUFFIX ?= -OS_LIB_PREFIX ?= lib -OS_LIB_SUFFIX ?= .so -OS_IMPLIB_EXT ?= .invalid -OS_LIBDEF_EXT ?= .invalid -OS_ARCHIVE_EXT ?= .a +OS_APP_PREFIX = +OS_APP_SUFFIX = +OS_LIB_PREFIX = lib +OS_LIB_SUFFIX = .so +OS_IMPLIB_EXT = .invalid +OS_LIBDEF_EXT = .invalid +OS_ARCHIVE_EXT = .a .PHONY: $(SHARED_IMPLIB) diff --git a/sysinfo/os/linux.mk b/sysinfo/os/linux.mk index ed6edbb..158c44b 100644 --- a/sysinfo/os/linux.mk +++ b/sysinfo/os/linux.mk @@ -1,9 +1,9 @@ -OS_APP_PREFIX ?= -OS_APP_SUFFIX ?= -OS_LIB_PREFIX ?= lib -OS_LIB_SUFFIX ?= .so -OS_IMPLIB_EXT ?= .invalid -OS_LIBDEF_EXT ?= .invalid -OS_ARCHIVE_EXT ?= .a +OS_APP_PREFIX = +OS_APP_SUFFIX = +OS_LIB_PREFIX = lib +OS_LIB_SUFFIX = .so +OS_IMPLIB_EXT = .invalid +OS_LIBDEF_EXT = .invalid +OS_ARCHIVE_EXT = .a .PHONY: $(SHARED_IMPLIB) diff --git a/sysinfo/os/midipix.mk b/sysinfo/os/midipix.mk index db23f2e..3d0d181 100644 --- a/sysinfo/os/midipix.mk +++ b/sysinfo/os/midipix.mk @@ -1,10 +1,10 @@ -OS_APP_PREFIX ?= -OS_APP_SUFFIX ?= -OS_LIB_PREFIX ?= lib -OS_LIB_SUFFIX ?= .so -OS_IMPLIB_EXT ?= .lib.a -OS_LIBDEF_EXT ?= .so.def -OS_ARCHIVE_EXT ?= .a +OS_APP_PREFIX = +OS_APP_SUFFIX = +OS_LIB_PREFIX = lib +OS_LIB_SUFFIX = .so +OS_IMPLIB_EXT = .lib.a +OS_LIBDEF_EXT = .so.def +OS_ARCHIVE_EXT = .a LDFLAGS_CONFIG += -mout-implib diff --git a/sysinfo/os/mingw.mk b/sysinfo/os/mingw.mk index 9350254..48078bd 100644 --- a/sysinfo/os/mingw.mk +++ b/sysinfo/os/mingw.mk @@ -1,10 +1,10 @@ -OS_APP_PREFIX ?= -OS_APP_SUFFIX ?= .exe -OS_LIB_PREFIX ?= lib -OS_LIB_SUFFIX ?= .dll -OS_IMPLIB_EXT ?= .dll.a -OS_LIBDEF_EXT ?= .def -OS_ARCHIVE_EXT ?= .a +OS_APP_PREFIX = +OS_APP_SUFFIX = .exe +OS_LIB_PREFIX = lib +OS_LIB_SUFFIX = .dll +OS_IMPLIB_EXT = .dll.a +OS_LIBDEF_EXT = .def +OS_ARCHIVE_EXT = .a CFLAGS_PIC = LDFLAGS_CONFIG += -Wl,--mout-implib,$(SHARED_IMPLIB) diff --git a/sysinfo/toolchain/clang.mk b/sysinfo/toolchain/clang.mk index 3e7bda3..bddb6b9 100644 --- a/sysinfo/toolchain/clang.mk +++ b/sysinfo/toolchain/clang.mk @@ -31,4 +31,4 @@ OBJCOPY = $(CROSS_COMPILE)objcopy READELF = $(CROSS_COMPILE)readelf -CFLAGS_PIC ?= -fPIC +CFLAGS_PIC = -fPIC diff --git a/sysinfo/toolchain/gcc.mk b/sysinfo/toolchain/gcc.mk index 72ae0af..441a2ca 100644 --- a/sysinfo/toolchain/gcc.mk +++ b/sysinfo/toolchain/gcc.mk @@ -22,4 +22,4 @@ OBJCOPY = $(CROSS_COMPILE)objcopy READELF = $(CROSS_COMPILE)readelf -CFLAGS_PIC ?= -fPIC +CFLAGS_PIC = -fPIC |