summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rühsen <tim.ruehsen@gmx.de>2018-06-06 09:45:32 +0200
committerTim Rühsen <tim.ruehsen@gmx.de>2018-06-14 11:07:47 +0200
commit3ff186ce59fde5bad9ea9e9bef873282b3969452 (patch)
tree6aeaff0e5b54e5ab75b33be1d4b17e6a60ce6595
parenta59d6a390c663d595acf3a9af401ec7f597bb644 (diff)
downloadgnutls-3ff186ce59fde5bad9ea9e9bef873282b3969452.tar.gz
Use $(MAKE) instead of make
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rw-r--r--Makefile.am16
-rw-r--r--cfg.mk12
2 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index f7da58920a..34ea4b5e0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,7 @@ ABIVER=$(shell git for-each-ref --sort=taggerdate --format '%(refname)' refs/tag
@echo "Creating ABI for $(ABIVER)"
cd $(ABI_TMPCLONEDIR) && \
git checkout $(ABIREF) && \
- make autoreconf && if test -f ../cache/config.cache;then\
+ $(MAKE) autoreconf && if test -f ../cache/config.cache;then\
CFLAGS="-g -Og" ./configure --disable-doc --cache-file ../cache/config.cache;\
else\
CFLAGS="-g -Og" ./configure --disable-doc;\
@@ -149,9 +149,9 @@ libopts-check:
test "`autoopts-config libsrc|cut -d '-' -f 2|sed 's/.tar.gz//'`" = "`cat $(srcdir)/src/libopts/autoopts/options.h |grep OPTIONS_VERSION_STRING|cut -d '"' -f 2|sed 's/:/./g'`"
files-update: libopts-check
- make -C doc/ compare-makefile || mv doc/tmp-compare-makefile doc/Makefile.am
- make -C doc/manpages compare-makefile || mv doc/manpages/tmp-compare-makefile doc/manpages/Makefile.am
- make -C . symbol-check || mv symbols.last.tmp symbols.last
+ $(MAKE) -C doc/ compare-makefile || mv doc/tmp-compare-makefile doc/Makefile.am
+ $(MAKE) -C doc/manpages compare-makefile || mv doc/manpages/tmp-compare-makefile doc/manpages/Makefile.am
+ $(MAKE) -C . symbol-check || mv symbols.last.tmp symbols.last
@echo "******************************************************************************************"
@echo "updating autogen files in src/"
@echo "******************************************************************************************"
@@ -163,10 +163,10 @@ files-update: libopts-check
@echo "******************************************************************************************"
dist-hook: libopts-check symbol-check
- make -C doc/ compare-makefile
- make -C doc/ compare-exported
- make -C doc/manpages compare-makefile
- make ChangeLog
+ $(MAKE) -C doc/ compare-makefile
+ $(MAKE) -C doc/ compare-exported
+ $(MAKE) -C doc/manpages compare-makefile
+ $(MAKE) ChangeLog
mv ChangeLog $(distdir)
$(SED) 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def
$(SED) 's/\@YEAR\@/$(YEAR)/g' -i $(distdir)/src/args-std.def
diff --git a/cfg.mk b/cfg.mk
index 525d52473d..2c227f370c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -96,10 +96,10 @@ glimport: unistringimport
# Code Coverage
clang:
- make clean
+ $(MAKE) clean
scan-build ./configure
rm -rf scan.tmp
- scan-build -o scan.tmp make
+ scan-build -o scan.tmp $(MAKE)
clang-copy:
rm -fv `find $(htmldir)/clang -type f | grep -v CVS`
@@ -129,14 +129,14 @@ web:
echo generating documentation for $(PACKAGE)
mkdir -p $(htmldir)/manual
mkdir -p $(htmldir)/reference
- make -C doc gnutls.html
+ $(MAKE) -C doc gnutls.html
cd doc && cp gnutls.html *.png ../$(htmldir)/manual/
cd doc && makeinfo --html --split=node -o ../$(htmldir)/manual/html_node/ --css-include=./texinfo.css gnutls.texi
cd doc && cp *.png ../$(htmldir)/manual/html_node/
sed 's/\@VERSION\@/$(VERSION)/g' -i $(htmldir)/manual/html_node/*.html $(htmldir)/manual/gnutls.html
- -cd doc && make gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
- cd doc/latex && make gnutls.pdf && cp gnutls.pdf ../../$(htmldir)/manual/
- make -C doc gnutls-guile.html gnutls-guile.pdf
+ -cd doc && $(MAKE) gnutls.epub && cp gnutls.epub ../$(htmldir)/manual/
+ cd doc/latex && $(MAKE) gnutls.pdf && cp gnutls.pdf ../../$(htmldir)/manual/
+ $(MAKE) -C doc gnutls-guile.html gnutls-guile.pdf
cd doc && makeinfo --html --split=node -o ../$(htmldir)/manual/gnutls-guile/ --css-include=./texinfo.css gnutls-guile.texi
cd doc && cp gnutls-guile.pdf gnutls-guile.html ../$(htmldir)/manual/
-cp -v doc/reference/html/*.html doc/reference/html/*.png doc/reference/html/*.devhelp* doc/reference/html/*.css $(htmldir)/reference/