[PROPOSED PATCH 1/2] Prefer '$(MAKE)' to 'make'
* Makefile (check_public, check_time_t_alternatives) (typecheck): Use '$(MAKE)' instead of 'make'. This has better behavior with GNU 'make' and -j. --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6f70979..8d624bc 100644 --- a/Makefile +++ b/Makefile @@ -324,6 +324,8 @@ GZIPFLAGS= -9n ############################################################################### +#MAKE= make + cc= cc CC= $(cc) -DTZDIR=\"$(TZDIR)\" @@ -572,8 +574,8 @@ set-timestamps.out: $(ENCHILADA) # We also do an all-files run to catch links to links. check_public: $(ENCHILADA) - make maintainer-clean - make "CFLAGS=$(GCC_DEBUG_FLAGS)" $(ENCHILADA) all + $(MAKE) maintainer-clean + $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" $(ENCHILADA) all mkdir tzpublic for i in $(TDATA) ; do \ $(zic) -v -d tzpublic $$i 2>&1 || exit; \ @@ -592,8 +594,8 @@ check_time_t_alternatives: zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \ for type in $(TIME_T_ALTERNATIVES); do \ mkdir -p tzpublic/$$type && \ - make clean_misc && \ - make TOPDIR=`pwd`/tzpublic/$$type \ + $(MAKE) clean_misc && \ + $(MAKE) TOPDIR=`pwd`/tzpublic/$$type \ CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \ REDO='$(REDO)' \ install && \ @@ -639,12 +641,12 @@ tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz gpg --armor --detach-sign $? typecheck: - make clean + $(MAKE) clean for i in "long long" unsigned; \ do \ - make CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \ + $(MAKE) CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \ ./zdump -v Europe/Rome ; \ - make clean ; \ + $(MAKE) clean ; \ done zonenames: $(TDATA) -- 2.1.0
* Makefile (ALL): Depend on $(ENCHILADA). (check_public): Do not depend on $(ENCHILADA), since we're about to remove some of it anyway. Use 'make ALL' to avoid useless chatter about 'Nothing to do'. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8d624bc..6d1336b 100644 --- a/Makefile +++ b/Makefile @@ -374,7 +374,7 @@ SHELL= /bin/sh all: tzselect zic zdump libtz.a $(TABDATA) -ALL: all date +ALL: all date $(ENCHILADA) install: all $(DATA) $(REDO) $(MANS) mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ @@ -573,9 +573,9 @@ set-timestamps.out: $(ENCHILADA) # The zics below ensure that each data file can stand on its own. # We also do an all-files run to catch links to links. -check_public: $(ENCHILADA) +check_public: $(MAKE) maintainer-clean - $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" $(ENCHILADA) all + $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL mkdir tzpublic for i in $(TDATA) ; do \ $(zic) -v -d tzpublic $$i 2>&1 || exit; \ -- 2.1.0
participants (1)
-
Paul Eggert