Permalink
Browse files

- Fix buildconf with BSD make

  • Loading branch information...
1 parent fda27b4 commit 996c9d85d7cee9a9b289d39a96c8af77e0b30821 foobar committed Feb 3, 2005
Showing with 7 additions and 11 deletions.
  1. +2 −10 build/build2.mk
  2. +5 −1 buildconf
View
@@ -32,14 +32,9 @@ 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)
-else
- debug_target = debugging
-endif
+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)
-
-all: $(targets) $(debug_target)
+all: $(targets)
acconfig.h: $(acconfig_h_SOURCES)
@echo rebuilding $@
@@ -63,6 +58,3 @@ configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
autoconf $(SUPPRESS_WARNINGS)
-debugging:
- @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
- $$libtoolize
View
@@ -66,4 +66,8 @@ fi
rm -f generated_lists
-${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" SHOW_WARNINGS="$debug"
+if test "$debug" = "yes"; then
+ ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
+else
+ ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"
+fi

0 comments on commit 996c9d8

Please sign in to comment.