diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | config.usage | 4 | ||||
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | sofort/defs.mk | 9 |
4 files changed, 29 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index d2479b0..d986e3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,6 +25,8 @@ CFLAGS_SITE = @cflags_site@ CFLAGS_PATH = @cflags_path@ CFLAGS_STRICT = @cflags_strict@ CFLAGS_UTIL = @cflags_util@ +CFLAGS_LAST = @cflags_last@ +CFLAGS_ONCE = @cflags_once@ LDFLAGS_COMMON = @ldflags_common@ LDFLAGS_DEBUG = @ldflags_debug@ @@ -34,6 +36,8 @@ LDFLAGS_SYSROOT = @ldflags_sysroot@ LDFLAGS_PATH = @ldflags_path@ LDFLAGS_STRICT = @ldflags_strict@ LDFLAGS_UTIL = @ldflags_util@ +LDFLAGS_LAST = @ldflags_last@ +LDFLAGS_ONCE = @ldflags_once@ PE_SUBSYSTEM = @pe_subsystem@ PE_IMAGE_BASE = @pe_image_base@ @@ -303,6 +307,8 @@ clean: clean-implib @echo CFLAGS_PATH:' '$(CFLAGS_PATH) @echo CFLAGS_STRICT:' '$(CFLAGS_STRICT) @echo CFLAGS_UTIL:' '$(CFLAGS_UTIL) + @echo CFLAGS_LAST:' '$(CFLAGS_LAST) + @echo CFLAGS_ONCE:' '$(CFLAGS_ONCE) @echo @echo LDFLAGS_COMMON:' '$(LDFLAGS_COMMON) @echo LDFLAGS_DEBUG:' '$(LDFLAGS_DEBUG) @@ -312,6 +318,8 @@ clean: clean-implib @echo LDFLAGS_PATH:' '$(LDFLAGS_PATH) @echo LDFLAGS_STRICT:' '$(LDFLAGS_STRICT) @echo LDFLAGS_UTIL:' '$(LDFLAGS_UTIL) + @echo LDFLAGS_LAST:' '$(LDFLAGS_LAST) + @echo LDFLAGS_ONCE:' '$(LDFLAGS_ONCE) @echo .display-pe: diff --git a/config.usage b/config.usage index 3d334a8..47599e9 100644 --- a/config.usage +++ b/config.usage @@ -80,6 +80,8 @@ supported variables: CFLAGS_PATH CFLAGS_STRICT CFLAGS_UTIL + CFLAGS_LAST + CFLAGS_ONCE LDFLAGS LDFLAGS_DEBUG @@ -90,6 +92,8 @@ supported variables: LDFLAGS_PATH LDFLAGS_STRICT LDFLAGS_UTIL + LDFLAGS_LAST + LDFLAGS_ONCE PE_SUBSYSTEM PE_IMAGE_BASE @@ -70,6 +70,8 @@ init_vars() mb_cflags_path=$CFLAGS_PATH mb_cflags_strict=$CFLAGS_STRICT mb_cflags_util=$CFLAGS_UTIL + mb_cflags_last=$CFLAGS_LAST + mb_cflags_once=$CFLAGS_ONCE mb_ldflags=$LDFLAGS mb_ldflags_debug=$LDFLAGS_DEBUG @@ -80,6 +82,8 @@ init_vars() mb_ldflags_path=$LDFLAGS_PATH mb_ldflags_strict=$LDFLAGS_STRICT mb_ldflags_util=$LDFLAGS_UTIL + mb_ldflags_last=$LDFLAGS_LAST + mb_ldflags_once=$LDFLAGS_ONCE mb_pe_subsystem=$PE_SUBSYSTEM mb_pe_image_base=$PE_IMAGE_BASE @@ -158,6 +162,8 @@ common_defaults() [ -z "$mb_cflags_path" ] && mb_cflags_path=$mb_default_cflags_path [ -z "$mb_cflags_strict" ] && mb_cflags_strict=$mb_default_cflags_strict [ -z "$mb_cflags_util" ] && mb_cflags_util=$mb_default_cflags_util + [ -z "$mb_cflags_last" ] && mb_cflags_last=$mb_default_cflags_last + [ -z "$mb_cflags_once" ] && mb_cflags_once=$mb_default_cflags_once [ -z "$mb_ldflags_debug" ] && mb_ldflags_debug=$mb_default_ldflags_debug [ -z "$mb_ldflags_common" ] && mb_ldflags_common=$mb_default_ldflags_common @@ -167,6 +173,8 @@ common_defaults() [ -z "$mb_ldflags_path" ] && mb_ldflags_path=$mb_default_ldflags_path [ -z "$mb_ldflags_strict" ] && mb_ldflags_strict=$mb_default_ldflags_strict [ -z "$mb_ldflags_util" ] && mb_ldflags_util=$mb_default_ldflags_util + [ -z "$mb_ldflags_last" ] && mb_ldflags_last=$mb_default_ldflags_last + [ -z "$mb_ldflags_once" ] && mb_ldflags_once=$mb_default_ldflags_once [ -z "$mb_pe_subsystem" ] && mb_pe_subsystem=$mb_default_pe_subsystem [ -z "$mb_pe_image_base" ] && mb_pe_image_base=$mb_default_pe_image_base @@ -380,6 +388,8 @@ config_copy() -e 's^@cflags_path@^'"$mb_cflags_path"'^g' \ -e 's^@cflags_strict@^'"$mb_cflags_strict"'^g' \ -e 's^@cflags_util@^'"$mb_cflags_util"'^g' \ + -e 's^@cflags_last@^'"$mb_cflags_last"'^g' \ + -e 's^@cflags_once@^'"$mb_cflags_once"'^g' \ \ -e 's^@ldflags@^'"$mb_ldflags"'^g' \ -e 's^@ldflags_debug@^'"$mb_ldflags_debug"'^g' \ @@ -390,6 +400,8 @@ config_copy() -e 's^@ldflags_path@^'"$mb_ldflags_path"'^g' \ -e 's^@ldflags_strict@^'"$mb_ldflags_strict"'^g' \ -e 's^@ldflags_util@^'"$mb_ldflags_util"'^g' \ + -e 's^@ldflags_last@^'"$mb_ldflags_last"'^g' \ + -e 's^@ldflags_once@^'"$mb_ldflags_once"'^g' \ \ -e 's^@pe_subsystem@^'"$mb_pe_subsystem"'^g' \ -e 's^@pe_image\_base@^'"$mb_pe_image_base"'^g' \ diff --git a/sofort/defs.mk b/sofort/defs.mk index 11cec0f..5810783 100644 --- a/sofort/defs.mk +++ b/sofort/defs.mk @@ -42,7 +42,8 @@ STATIC_APP = bin/$(OS_APP_PREFIX)$(NICKNAME)-static$(OS_APP_SUFFIX) CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_CONFIG) $(CFLAGS_SYSROOT) \ $(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST) \ $(CFLAGS_PATH) $(CFLAGS_OS) $(CFLAGS_SITE) \ - $(CFLAGS_VERSION) $(CFLAGS_STRICT) + $(CFLAGS_VERSION) $(CFLAGS_STRICT) \ + $(CFLAGS_LAST) $(CFLAGS_ONCE) CFLAGS_SHARED = $(CFLAGS) $(CFLAGS_PIC) $(CFLAGS_SHARED_ATTR) CFLAGS_STATIC = $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_STATIC_ATTR) @@ -51,14 +52,14 @@ CFLAGS_APP = $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR) $(CFLAGS_UTIL) LDFLAGS_SHARED = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(SHARED_LIB_DEPS) $(LDFLAGS_STRICT) \ - $(LDFLAGS_LAST) + $(LDFLAGS_LAST) $(LDFLAGS_ONCE) LDFLAGS_APP = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(SHARED_APP_DEPS) $(LDFLAGS_STRICT) \ - $(LDFLAGS_UTIL) $(LDFLAGS_LAST) + $(LDFLAGS_UTIL) $(LDFLAGS_LAST) $(LDFLAGS_ONCE) LDFLAGS_STATIC = $(LDFLAGS_DEBUG) $(LDFLAGS_CONFIG) $(LDFLAGS_SYSROOT) \ $(LDFLAGS_COMMON) $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST) \ $(LDFLAGS_PATH) $(STATIC_APP_DEPS) $(LDFLAGS_STRICT) \ - $(LDFLAGS_LAST) + $(LDFLAGS_LAST) $(LDFLAGS_ONCE) |