diff options
-rw-r--r-- | build/build.mk | 4 | ||||
-rw-r--r-- | build/build2.mk | 3 | ||||
-rwxr-xr-x | buildconf | 8 |
3 files changed, 4 insertions, 11 deletions
diff --git a/build/build.mk b/build/build.mk index a3e12f791c..cc08df5671 100644 --- a/build/build.mk +++ b/build/build.mk @@ -30,7 +30,7 @@ ALWAYS = generated_lists all: $(STAMP) $(ALWAYS) - @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk + @$(MAKE) -s -f build/build2.mk generated_lists: @echo makefile_am_files = $(ZENDDIR)/Makefile.am \ @@ -55,7 +55,7 @@ snapshot: test -d $$i || (test -d ../$$i && cp -rp ../$$i $$i); \ done; \ find . -type l -exec rm {} \; ; \ - $(MAKE) AMFLAGS=--copy -f build/build.mk; \ + $(MAKE) -f build/build.mk; \ cd ..; \ tar cf $$distname.tar $$distname; \ rm -rf $$distname $$distname.tar.*; \ diff --git a/build/build2.mk b/build/build2.mk index 507438f48c..9d86f53f3b 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -23,9 +23,6 @@ TOUCH_FILES = mkinstalldirs install-sh missing LT_TARGETS = ltmain.sh config.guess config.sub -makefile_in_files = $(makefile_am_files:.am=.in) -makefile_files = $(makefile_am_files:e.am=e) - config_h_in = main/php_config.h.in acconfig_h_SOURCES = acconfig.h.in $(config_h_files) @@ -15,10 +15,6 @@ devok=0 debug=no while test $# -gt 0; do - if test "$1" = "--copy"; then - automake_flags=--copy - fi - if test "$1" = "--force"; then devok=1 echo "Forcing buildconf" @@ -67,7 +63,7 @@ fi rm -f generated_lists if test "$debug" = "yes"; then - ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS="" + ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS="" else - ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" + ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR" fi |