Skip to content

Commit

Permalink
- Fix buildconf with BSD make
Browse files Browse the repository at this point in the history
  • Loading branch information
foobar committed Feb 3, 2005
1 parent fda27b4 commit 996c9d8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
12 changes: 2 additions & 10 deletions build/build2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand All @@ -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
6 changes: 5 additions & 1 deletion buildconf
Original file line number Diff line number Diff line change
Expand Up @@ -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.