Skip to content

Commit a56e81f

Browse files
author
Jani Taskinen
committed
- Removed unused parts
1 parent 5c1d0c3 commit a56e81f

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

build/build.mk

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
# Makefile to generate build tools
2121
#
2222

23-
ZENDDIR = Zend
24-
25-
SUBDIRS = $(ZENDDIR) TSRM
23+
SUBDIRS = Zend TSRM
2624

2725
STAMP = buildmk.stamp
2826

@@ -33,11 +31,10 @@ all: $(STAMP) $(ALWAYS)
3331
@$(MAKE) -s -f build/build2.mk
3432

3533
generated_lists:
36-
@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
37-
TSRM/Makefile.am > $@
38-
@echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
39-
@echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
40-
$(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
34+
@echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@
35+
@echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
36+
@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
37+
Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
4138

4239
$(STAMP): build/buildcheck.sh
4340
@build/buildcheck.sh $(STAMP)

buildconf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fi
3636
rm -f generated_lists
3737

3838
if test "$debug" = "yes"; then
39-
${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/" SUPPRESS_WARNINGS=""
39+
${MAKE:-make} -s -f build/build.mk SUPPRESS_WARNINGS=""
4040
else
41-
${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/"
41+
${MAKE:-make} -s -f build/build.mk
4242
fi

0 commit comments

Comments
 (0)