X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Rules.mak;h=6df828c7c658a03fb75114b2a2eab871ee62081f;hb=5d8843e451c01d8abfe6b5be772637310e9e581e;hp=51c9baeab48304191b1844c09fbf1d5da78bca65;hpb=d9969ea175503bdd37fdc966a0ed38bb6f81ff89;p=oweals%2Fbusybox.git diff --git a/Rules.mak b/Rules.mak index 51c9baeab..6df828c7c 100644 --- a/Rules.mak +++ b/Rules.mak @@ -10,18 +10,12 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) -include $(top_builddir)/.config endif -ifeq ($(MAKELEVEL),0) -ifeq ($(HAVE_DOT_CONFIG),y) -rules-mak-rules:=0 -endif -endif - #-------------------------------------------------------- PROG := busybox MAJOR_VERSION :=1 -MINOR_VERSION :=1 -SUBLEVEL_VERSION:=1 -EXTRAVERSION :=-pre0 +MINOR_VERSION :=2 +SUBLEVEL_VERSION:=0 +EXTRAVERSION := VERSION :=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL_VERSION)$(EXTRAVERSION) BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") @@ -30,112 +24,47 @@ BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") # With a modern GNU make(1) (highly recommended, that's what all the # developers use), all of the following configuration values can be # overridden at the command line. For example: -# make CROSS=powerpc-linux- top_srcdir="$HOME/busybox" PREFIX=/mnt/app +# make CROSS_COMPILE=powerpc-linux- top_srcdir="$HOME/busybox" PREFIX=/mnt/app #-------------------------------------------------------- -# If you are running a cross compiler, you will want to set 'CROSS' +# If you are running a cross compiler, you will want to set CROSS_COMPILE # to something more interesting... Target architecture is determined # by asking the CC compiler what arch it compiles things for, so unless -# your compiler is broken, you should not need to specify __TARGET_ARCH -CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) -#") -CC = $(CROSS)gcc -AR = $(CROSS)ar -AS = $(CROSS)as -LD = $(CROSS)ld -NM = $(CROSS)nm -STRIP = $(CROSS)strip +# your compiler is broken, you should not need to specify TARGET_ARCH +CC = $(CROSS_COMPILE)gcc +AR = $(CROSS_COMPILE)ar +AS = $(CROSS_COMPILE)as +LD = $(CROSS_COMPILE)ld +NM = $(CROSS_COMPILE)nm +STRIP = $(CROSS_COMPILE)strip +ELF2FLT = $(CROSS_COMPILE)elf2flt CPP = $(CC) -E SED ?= sed -AWK ?= awk +BZIP2 ?= bzip2 -ifdef PACKAGE_BE_VERBOSE -PACKAGE_BE_VERBOSE := $(shell echo $(PACKAGE_BE_VERBOSE) | $(SED) "s/[[:alpha:]]*//g") -endif - -# for make V=3 and above make $(shell) invocations verbose -ifeq ($(if $(strip $(PACKAGE_BE_VERBOSE)),$(shell test $(PACKAGE_BE_VERBOSE) -gt 2 ; echo $$?),1),0) - SHELL+=-x - MKDEP_ARGS:=-w -endif - # What OS are you compiling busybox for? This allows you to include # OS specific things, syscall overrides, etc. TARGET_OS=linux -# Select the compiler needed to build binaries for your development system -HOSTCC = gcc -HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer - # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. LC_ALL:= C -# If you want to add some simple compiler switches (like -march=i686), -# especially from the command line, use this instead of CFLAGS directly. -# For optimization overrides, it's better still to set OPTIMIZATIONS. -CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) -#") +# This must bind late because srcdir is reset for every source subdirectory. +INCS:=-I$(top_builddir)/include -I$(top_srcdir)/include +CFLAGS=$(INCS) -I$(srcdir) -D_GNU_SOURCE +CFLAGS+=$(CHECKED_CFLAGS) +ARFLAGS=cru -# To compile vs some other alternative libc, you may need to use/adjust -# the following lines to meet your needs... -# -# If you are using Red Hat 6.x with the compatible RPMs (for developing under -# Red Hat 5.x and glibc 2.0) uncomment the following. Be sure to read about -# using the compatible RPMs (compat-*) at http://www.redhat.com ! -#LIBCDIR:=/usr/i386-glibc20-linux -# -# For other libraries, you are on your own. But these may (or may not) help... -#LDFLAGS+=-nostdlib -#LIBRARIES:=$(LIBCDIR)/lib/libc.a -lgcc -#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR) -funsigned-char -#GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") - -WARNINGS=-Wall -Wstrict-prototypes -Wshadow -CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include - -ARFLAGS=cruP - - - -# Get the CC MAJOR/MINOR version # gcc centric. Perhaps fiddle with findstring gcc,$(CC) for the rest +# get the CC MAJOR/MINOR version CC_MAJOR:=$(shell printf "%02d" $(shell echo __GNUC__ | $(CC) -E -xc - | tail -n 1)) CC_MINOR:=$(shell printf "%02d" $(shell echo __GNUC_MINOR__ | $(CC) -E -xc - | tail -n 1)) -# Note: spaces are significant here! -# Check if CC version is equal to given MAJOR,MINOR. Returns empty if false. -define cc_eq -$(shell [ $(CC_MAJOR) -eq $(1) -a $(CC_MINOR) -eq $(2) ] && echo y) -endef -# Check if CC version is greater or equal than given MAJOR,MINOR -define cc_ge -$(shell [ $(CC_MAJOR) -ge $(1) -a $(CC_MINOR) -ge $(2) ] && echo y) -endef -# Check if CC version is less or equal than given MAJOR,MINOR -define cc_le -$(shell [ $(CC_MAJOR) -le $(1) -a $(CC_MINOR) -le $(2) ] && echo y) -endef - -# Workaround bugs in make-3.80 for eval in conditionals -define is_eq -$(shell [ $(1) = $(2) ] 2> /dev/null && echo y) -endef -define is_neq -$(shell [ $(1) != $(2) ] 2> /dev/null && echo y) -endef - #-------------------------------------------------------- -export VERSION BUILDTIME HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP - -# TARGET_ARCH and TARGET_MACH will be passed verbatim to CC with recent -# versions of make, so we use __TARGET_ARCH here. -# Current builtin rules looks like that: -# COMPILE.s = $(AS) $(ASFLAGS) $(TARGET_MACH) -# COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c - -ifeq ($(strip $(__TARGET_ARCH)),) -__TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ +export VERSION BUILDTIME HOSTCC HOSTCFLAGS CROSS_COMPILE CC AR AS LD NM STRIP CPP +ifeq ($(strip $(TARGET_ARCH)),) +TARGET_ARCH:=$(shell $(CC) -dumpmachine | $(SED) -e s'/-.*//' \ -e 's/i.86/i386/' \ -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/g' \ @@ -149,60 +78,161 @@ __TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ ) endif -$(call check_gcc,CFLAGS,-funsigned-char,) -$(call check_gcc,CFLAGS,-mmax-stack-frame=256,) +# A nifty macro to make testing gcc features easier, but note that everything +# that uses this _must_ use := or it will be re-evaluated everytime it is +# referenced. +ifeq ($(strip $(BUILD_VERBOSE)),2) +VERBOSE_CHECK_CC=echo CC=\"$(1)\" check_cc $(2) >&2; +endif +check_cc=$(shell \ + $(VERBOSE_CHECK_CC) \ + if [ "x$(1)" != "x" ] && [ "x$(2)" != "x" ]; then \ + echo "int i;" > ./conftest.c; \ + if $(1) $(2) -c -o conftest.o conftest.c > /dev/null 2>&1; \ + then echo "$(2)"; else echo "$(3)"; fi ; \ + rm -f conftest.c conftest.o; \ + fi) + +ifneq ($(filter $(nocheck_targets),$(MAKECMDGOALS)),) +check_cc:= +endif + +# A not very robust macro to check for available ld flags +ifeq ($(strip $(BUILD_VERBOSE)),2) +VERBOSE_CHECK_LD=echo LD=\"$(1)\" check_ld $(2) >&2; +endif +check_ld=$(shell \ + $(VERBOSE_CHECK_LD) \ + if [ "x$(1)" != "x" ] && [ "x$(2)" != "x" ]; then \ + $(1) -o /dev/null -b binary /dev/null > /dev/null 2>&1 && \ + echo "-Wl,$(2)" ; \ + fi) + +ifneq ($(filter $(nocheck_targets),$(MAKECMDGOALS)),) +check_ld:= +endif + +# A not very robust macro to check for available strip flags +ifeq ($(strip $(BUILD_VERBOSE)),2) +VERBOSE_CHECK_STRIP=echo STRIPCMD=\"$(1)\" check_strip $(2) >&2; +endif +check_strip=$(shell \ + $(VERBOSE_CHECK_STRIP) \ + if [ "x$(1)" != "x" ] && [ "x$(2)" != "x" ]; then \ + echo "int i;" > ./conftest.c ; \ + $(CC) -c -o conftest.o conftest.c > /dev/null 2>&1 ; \ + $(1) $(2) conftest.o > /dev/null 2>&1 && \ + echo "$(1) $(2)" || echo "$(3)"; \ + rm -f conftest.c conftest.o > /dev/null 2>&1 ; \ + fi) + +ifneq ($(filter $(nocheck_targets),$(MAKECMDGOALS)),) +check_strip:= +endif + + +# Select the compiler needed to build binaries for your development system +HOSTCC = gcc +HOSTCFLAGS:=$(call check_cc,$(HOSTCC),-Wall,) +HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-Wstrict-prototypes,) +HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-O2,) +HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-fomit-frame-pointer,) + +LD_WHOLE_ARCHIVE:=$(shell echo "int i;" > conftest.c ; \ + $(CC) -c -o conftest.o conftest.c ; \ + echo "int main(void){return 0;}" > conftest_main.c ; \ + $(CC) -c -o conftest_main.o conftest_main.c ; \ + $(AR) $(ARFLAGS) conftest.a conftest.o ; \ + $(CC) -Wl,--whole-archive conftest.a -Wl,--no-whole-archive \ + conftest_main.o -o conftest > /dev/null 2>&1 \ + && echo "-Wl,--whole-archive" ; \ + rm conftest_main.o conftest_main.c conftest.o conftest.c \ + conftest.a conftest > /dev/null 2>&1 ; ) +ifneq ($(findstring whole-archive,$(LD_WHOLE_ARCHIVE)),) +LD_NO_WHOLE_ARCHIVE:= -Wl,--no-whole-archive +endif + +LD_START_GROUP:=$(shell echo "int bar(void){return 0;}" > conftest.c ; \ + $(CC) -c -o conftest.o conftest.c ; \ + echo "int main(void){return bar();}" > conftest_main.c ; \ + $(CC) -c -o conftest_main.o conftest_main.c ; \ + $(AR) $(ARFLAGS) conftest.a conftest.o ; \ + $(CC) -Wl,--start-group conftest.a conftest_main.o -Wl,--end-group \ + -o conftest > /dev/null 2>&1 && echo "-Wl,--start-group" ; \ + rm conftest_main.o conftest_main.c conftest.o conftest.c \ + conftest.a conftest > /dev/null 2>&1 ; ) +ifneq ($(findstring start-group,$(LD_START_GROUP)),) +LD_END_GROUP:= -Wl,--end-group +endif + +CHECKED_LDFLAGS := $(call check_ld,$(LD),--warn-common,) + +# Pin CHECKED_CFLAGS with := so it's only evaluated once. +CHECKED_CFLAGS:=$(call check_cc,$(CC),-Wall,) +CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wstrict-prototypes,) +CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wshadow,) +CHECKED_CFLAGS+=$(call check_cc,$(CC),-funsigned-char,) +CHECKED_CFLAGS+=$(call check_cc,$(CC),-mmax-stack-frame=256,) +CHECKED_CFLAGS+=$(call check_cc,$(CC),-fno-builtin-strlen) +CHECKED_CFLAGS+=$(call check_cc,$(CC),-finline-limit=0) + +# Preemptively pin this too. +PROG_CFLAGS:= + #-------------------------------------------------------- # Arch specific compiler optimization stuff should go here. # Unless you want to override the defaults, do not set anything -# for OPTIMIZATIONS... +# for OPTIMIZATION... # use '-Os' optimization if available, else use -O2 -$(call check_gcc,OPTIMIZATIONS,-Os,-O2) +OPTIMIZATION:=$(call check_cc,$(CC),-Os,-O2) +ifeq ($(CONFIG_BUILD_AT_ONCE),y) # gcc 2.95 exits with 0 for "unrecognized option" -$(if $(call is_eq,$(CONFIG_BUILD_AT_ONCE),y),\ - $(if $(call cc_ge,3,0),\ - $(call check_gcc,CFLAGS_COMBINE,--combine,))) - -$(if $(call is_eq,$(CONFIG_BUILD_AT_ONCE),y),\ - $(call check_gcc,OPTIMIZATIONS,-funit-at-a-time,)) - +ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 3 ] ; echo $$?)),0) + CFLAGS_COMBINE:=$(call check_cc,$(CC),--combine,) +endif +OPTIMIZATION+=$(call check_cc,$(CC),-funit-at-a-time,) +OPTIMIZATION+=$(call check_cc,$(CC),-fgcse-after-reload,) +ifneq ($(CONFIG_BUILD_LIBBUSYBOX),y) # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25795 -#$(if $(call is_eq,$(CONFIG_BUILD_AT_ONCE),y),\ -# $(call check_gcc,PROG_CFLAGS,-fwhole-program,)) +# This prevents us from using -fwhole-program when we build the lib +PROG_CFLAGS+=$(call check_cc,$(CC),-fwhole-program,) +endif # CONFIG_BUILD_LIBBUSYBOX +endif # CONFIG_BUILD_AT_ONCE -$(call check_ld,LIB_LDFLAGS,--enable-new-dtags,) -#$(call check_ld,LIB_LDFLAGS,--reduce-memory-overheads,) -#$(call check_ld,LIB_LDFLAGS,--as-needed,) -#$(call check_ld,LIB_LDFLAGS,--warn-shared-textrel,) +LIB_LDFLAGS:=$(call check_ld,$(LD),--enable-new-dtags,) +#LIB_LDFLAGS+=$(call check_ld,$(LD),--reduce-memory-overheads,) +#LIB_LDFLAGS+=$(call check_ld,$(LD),--as-needed,) +#LIB_LDFLAGS+=$(call check_ld,$(LD),--warn-shared-textrel,) -$(call check_ld,PROG_LDFLAGS,--gc-sections,) # Some nice architecture specific optimizations -ifeq ($(__TARGET_ARCH),arm) - OPTIMIZATIONS+=-fstrict-aliasing -endif # arm - -$(if $(call is_eq,$(__TARGET_ARCH),i386),\ - $(call check_gcc,OPTIMIZATIONS,-march=i386,)) - +ifeq ($(strip $(TARGET_ARCH)),arm) + OPTIMIZATION+=-fstrict-aliasing +endif +ifeq ($(strip $(TARGET_ARCH)),i386) + OPTIMIZATION+=$(call check_cc,$(CC),-march=i386,) # gcc-4.0 and older seem to benefit from these -$(if $(call cc_le,4,0),\ - $(call check_gcc,OPTIMIZATIONS,-mpreferred-stack-boundary=2,)\ - $(call check_gcc,OPTIMIZATIONS,-falign-functions=1 -falign-jumps=1 -falign-loops=1,\ - -malign-functions=0 -malign-jumps=0 -malign-loops=0)) +#ifneq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0) + OPTIMIZATION+=$(call check_cc,$(CC),-mpreferred-stack-boundary=2,) + OPTIMIZATION+=$(call check_cc,$(CC),-falign-functions=1 -falign-jumps=1 -falign-loops=1,\ + -malign-functions=0 -malign-jumps=0 -malign-loops=0) +#endif # gcc-4.0 and older # gcc-4.1 and beyond seem to benefit from these -# turn off flags which hurt -Os -$(if $(call cc_ge,4,1),\ - $(call check_gcc,OPTIMIZATIONS,-fno-tree-loop-optimize,)\ - $(call check_gcc,OPTIMIZATIONS,-fno-tree-dominator-opts,)\ - $(call check_gcc,OPTIMIZATIONS,-fno-strength-reduce,)\ -\ - $(call check_gcc,OPTIMIZATIONS,-fno-branch-count-reg,)) - -$(call check_gcc,OPTIMIZATIONS,-fomit-frame-pointer,) +ifeq ($(strip $(shell [ $(CC_MAJOR) -ge 4 -a $(CC_MINOR) -ge 1 ] ; echo $$?)),0) + # turn off flags which hurt -Os + OPTIMIZATION+=$(call check_cc,$(CC),-fno-tree-loop-optimize,) + OPTIMIZATION+=$(call check_cc,$(CC),-fno-tree-dominator-opts,) + OPTIMIZATION+=$(call check_cc,$(CC),-fno-strength-reduce,) + + OPTIMIZATION+=$(call check_cc,$(CC),-fno-branch-count-reg,) +endif # gcc-4.1 and beyond +endif +OPTIMIZATION+=$(call check_cc,$(CC),-fomit-frame-pointer,) +OPTIMIZATION+=$(call check_cc,$(CC),-ffunction-sections -fdata-sections,) # #-------------------------------------------------------- @@ -213,40 +243,57 @@ $(call check_gcc,OPTIMIZATIONS,-fomit-frame-pointer,) # prone to casual user adjustment. # -ifeq ($(CONFIG_LFS),y) +ifeq ($(strip $(CONFIG_LFS)),y) # For large file summit support CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif -ifeq ($(CONFIG_DMALLOC),y) +ifeq ($(strip $(CONFIG_DMALLOC)),y) # For testing mem leaks with dmalloc CFLAGS+=-DDMALLOC LIBRARIES:=-ldmalloc else - ifeq ($(CONFIG_EFENCE),y) + ifeq ($(strip $(CONFIG_EFENCE)),y) LIBRARIES:=-lefence endif endif -$(if $(call is_eq,$(CONFIG_DEBUG),y),\ - $(call check_ld,LDFLAGS,--warn-common,),\ - $(call check_ld,LDFLAGS,--warn-common,)$(call check_ld,LDFLAGS,--sort-common,)) -ifeq ($(CONFIG_DEBUG),y) - CFLAGS +=$(WARNINGS) -g -D_GNU_SOURCE - STRIPCMD:=/bin/true -Not_stripping_since_we_are_debugging +# Debugging info + +ifeq ($(strip $(CONFIG_DEBUG)),y) + CFLAGS +=-g else - CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG - STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment + CFLAGS +=-DNDEBUG + CHECKED_LDFLAGS += $(call check_ld,$(LD),--sort-common,) + CHECKED_LDFLAGS += $(call check_ld,--gc-sections,) +endif + +ifneq ($(strip $(CONFIG_DEBUG_PESSIMIZE)),y) + CFLAGS += $(OPTIMIZATION) endif -$(if $(call is_eq,$(CONFIG_STATIC),y),\ - $(call check_gcc,PROG_CFLAGS,-static,)) -$(call check_gcc,CFLAGS_SHARED,-shared,) +# warn a bit more verbosely for non-release versions +ifneq ($(EXTRAVERSION),) + CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wstrict-prototypes,) + CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wmissing-prototypes,) + CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wmissing-declarations,) + CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wunused,) + CHECKED_CFLAGS+=$(call check_cc,$(CC),-Winit-self,) + CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wshadow,) + CHECKED_CFLAGS+=$(call check_cc,$(CC),-Wcast-align,) +endif +STRIPCMD:=$(call check_strip,$(STRIP),-s --remove-section=.note --remove-section=.comment,$(STRIP)) +ifeq ($(strip $(CONFIG_STATIC)),y) + PROG_CFLAGS += $(call check_cc,$(CC),-static,) +endif +CFLAGS_SHARED := $(call check_cc,$(CC),-shared,) LIB_CFLAGS+=$(CFLAGS_SHARED) -$(if $(call is_eq,$(CONFIG_BUILD_LIBBUSYBOX),y),\ - $(call check_gcc,CFLAGS_PIC,-fPIC,)) +ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) + CFLAGS_PIC:= $(call check_cc,$(CC),-fPIC,) + LIB_CFLAGS+=$(CFLAGS_PIC) +endif -ifeq ($(CONFIG_SELINUX),y) +ifeq ($(strip $(CONFIG_SELINUX)),y) LIBRARIES += -lselinux endif @@ -254,14 +301,28 @@ ifeq ($(strip $(PREFIX)),) PREFIX:=`pwd`/_install endif -CFLAGS += $(CROSS_CFLAGS) +ifneq ($(strip $(CONFIG_GETOPT_LONG)),y) + CFLAGS += -D__need_getopt +endif + +# Additional complications due to support for pristine source dir. +# Include files in the build directory should take precedence over +# the copy in top_srcdir, both during the compilation phase and the +# shell script that finds the list of object files. +# Work in progress by . + + +OBJECTS:=$(APPLET_SOURCES:.c=.o) busybox.o usage.o applets.o +CFLAGS += $(CHECKED_CFLAGS) $(CROSS_CFLAGS) +LDFLAGS += $(CHECKED_LDFLAGS) + ifdef BB_INIT_SCRIPT CFLAGS += -DINIT_SCRIPT='"$(BB_INIT_SCRIPT)"' endif # Put user-supplied flags at the end, where they # have a chance of winning. -CFLAGS += $(CFLAGS_EXTRA) +-include $(top_builddir)/.config.mak #------------------------------------------------------------ # Installation options @@ -275,118 +336,91 @@ ifeq ($(strip $(CONFIG_INSTALL_APPLET_DONT)),y) INSTALL_OPTS= endif - -#------------------------------------------------------------ -# object extensions - -# object potentially used in shared object -ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) -# single-object extension -os:=.os -# multi-object extension -om:=.osm -else -os:=.o -om:=.om -endif - #------------------------------------------------------------ # Make the output nice and tight - -# for make V=2 and above, do print directory -ifneq ($(shell test -n "$(strip $(PACKAGE_BE_VERBOSE))" && test $(PACKAGE_BE_VERBOSE) -gt 1 ; echo $$?),0) - MAKEFLAGS += --no-print-directory -endif - -export MAKEOVERRIDES +MAKEFLAGS += --no-print-directory export MAKE_IS_SILENT=n ifneq ($(findstring s,$(MAKEFLAGS)),) export MAKE_IS_SILENT=y +SECHO := @-false DISP := sil Q := @ else -ifneq ($(V)$(VERBOSE),) +ifneq ($(BUILD_VERBOSE),) +SECHO := @-false DISP := ver Q := else +SECHO := @echo DISP := pur Q := @ endif endif -define show_objs - $(subst $(top_builddir)/,,$(subst ../,,$@)) -endef -pur_disp_compile.c = @echo " "CC $(show_objs) ; -pur_disp_compile.h = @echo " "HOSTCC $(show_objs) ; -pur_disp_strip = @echo " "STRIP $(show_objs) ; -pur_disp_link = @echo " "LINK $(show_objs) ; -pur_disp_link.h = @echo " "HOSTLINK $(show_objs) ; -pur_disp_ar = @echo " "AR $(ARFLAGS) $(show_objs) ; -pur_disp_gen = @echo " "GEN $@ ; -pur_disp_doc = @echo " "DOC $(subst docs/,,$@) ; -pur_disp_bin = @echo " "BIN $(show_objs) ; -sil_disp_compile.c = @ -sil_disp_compile.h = @ -sil_disp_strip = @ -sil_disp_link = @ -sil_disp_link.h = @ -sil_disp_ar = @ -sil_disp_gen = @ -sil_disp_doc = @ -sil_disp_bin = @ -ver_disp_compile.c = -ver_disp_compile.h = -ver_disp_strip = -ver_disp_link = -ver_disp_link.h = -ver_disp_ar = -ver_disp_gen = -ver_disp_doc = -ver_disp_bin = +show_objs = $(subst $(top_builddir)/,,$(subst ../,,$@)) +pur_disp_compile.c = echo " "CC $(show_objs) +pur_disp_compile.h = echo " "HOSTCC $(show_objs) +pur_disp_strip = echo " "STRIP $(show_objs) +pur_disp_link = echo " "LINK $(show_objs) +pur_disp_link.h = echo " "HOSTLINK $(show_objs) +pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs) +pur_disp_elf2flt = echo " "ELF2FLT $(ELF2FLTFLAGS) $(show_objs) +sil_disp_compile.c = true +sil_disp_compile.h = true +sil_disp_strip = true +sil_disp_link = true +sil_disp_link.h = true +sil_disp_ar = true +sil_disp_elf2flt = true +ver_disp_compile.c = echo $(cmd_compile.c) +ver_disp_compile.h = echo $(cmd_compile.h) +ver_disp_strip = echo $(cmd_strip) +ver_disp_link = echo $(cmd_link) +ver_disp_link.h = echo $(cmd_link.h) +ver_disp_ar = echo $(cmd_ar) +ver_disp_elf2flt = echo $(cmd_elf2flt) disp_compile.c = $($(DISP)_disp_compile.c) disp_compile.h = $($(DISP)_disp_compile.h) disp_strip = $($(DISP)_disp_strip) disp_link = $($(DISP)_disp_link) disp_link.h = $($(DISP)_disp_link.h) disp_ar = $($(DISP)_disp_ar) -disp_gen = $($(DISP)_disp_gen) -disp_doc = $($(DISP)_disp_doc) -disp_bin = $($(DISP)_disp_bin) -# CFLAGS-dir == $(CFLAGS-$(notdir $(@D))) -# CFLAGS-dir-file.o == $(CFLAGS-$(notdir $(@D))-$(notdir $(@F))) -# CFLAGS-dir-file.c == $(CFLAGS-$(notdir $(