diff options
Diffstat (limited to 'build/build2.mk')
| -rw-r--r-- | build/build2.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/build/build2.mk b/build/build2.mk index 9b3d538d19..97fd53ee44 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -32,6 +32,11 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files) targets = $(TOUCH_FILES) configure $(config_h_in) +ifeq ($(SHOW_WARNINGS), no) + SUPPRESS_WARNINGS = 2>&1 | (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT is expanded from...|the top level)'||true) + libtoolize_flags = --automake +endif + all: $(targets) @@ -39,14 +44,12 @@ acconfig.h: $(acconfig_h_SOURCES) @echo rebuilding $@ cat $(acconfig_h_SOURCES) > $@ -SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times)'||true) - $(config_h_in): configure acconfig.h # explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @echo rebuilding $@ @rm -f $@ - @autoheader 2>&1 | $(SUPPRESS_WARNINGS) + @autoheader $(SUPPRESS_WARNINGS) $(TOUCH_FILES): touch $(TOUCH_FILES) @@ -54,11 +57,11 @@ $(TOUCH_FILES): aclocal.m4: configure.in acinclude.m4 @echo rebuilding $@ @libtoolize=`./build/shtool path glibtoolize libtoolize`; \ - $$libtoolize --copy --automake; \ + $$libtoolize --copy $(libtoolize_flags); \ ltpath=`dirname $$libtoolize`; \ ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \ cat acinclude.m4 $$ltfile > $@ configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ - @autoconf 2>&1 | $(SUPPRESS_WARNINGS) + @autoconf $(SUPPRESS_WARNINGS) |