js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't use ${MFLAGS} with ${MAKE}

Browse source 
gmake starts complaining about this starting with 4.2.
This commit is contained in:
Jonathan Schleifer 2016-07-03 21:03:27 +02:00
parent d9cf426fe1
commit 953b1d1e78
No known key found for this signature in database
GPG key ID: 338C3541DB54E169
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
buildsys.mk.in
View file

@ -114,10 +114,10 @@ MO_FILES = ${LOCALES:.po=.mo}
all: all:
${MAKE} pre-all ${MAKE} pre-all
${MAKE} ${MFLAGS} subdirs ${MAKE} subdirs
${MAKE} ${MFLAGS} depend ${MAKE} depend
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
${MAKE} ${MFLAGS} subdirs-after ${MAKE} subdirs-after
${MAKE} post-all ${MAKE} post-all
pre-all post-all: pre-all post-all:
@ -128,7 +128,7 @@ subdirs-after: ${SUBDIRS_AFTER}
${SUBDIRS} ${SUBDIRS_AFTER}: ${SUBDIRS} ${SUBDIRS_AFTER}:
for i in $@; do \ for i in $@; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} || exit $$?; \ ${MAKE} || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -172,7 +172,7 @@ depend: pre-depend ${SRCS}
done; \ done; \
if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
${DEPEND_STATUS}; \ ${DEPEND_STATUS}; \
if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \ if ${MAKE} $$deps && cat $$deps >.deps; then \
rm -f $$deps; \ rm -f $$deps; \
${DEPEND_OK}; \ ${DEPEND_OK}; \
else \ else \
@ -623,7 +623,7 @@ locales: ${MO_FILES}
install: all install-extra install: all install-extra
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} install || exit $$?; \ ${MAKE} install || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -704,7 +704,7 @@ install-extra:
uninstall: uninstall-extra uninstall: uninstall-extra
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} uninstall || exit $$?; \ ${MAKE} uninstall || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -797,7 +797,7 @@ uninstall-extra:
clean: clean:
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} clean || exit $$?; \ ${MAKE} clean || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -814,7 +814,7 @@ clean:
distclean: clean distclean: clean
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} distclean || exit $$?; \ ${MAKE} distclean || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -832,7 +832,7 @@ print-hierarchy:
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
echo ${PRINT_HIERARCHY_PREFIX}$$i; \ echo ${PRINT_HIERARCHY_PREFIX}$$i; \
cd $$i || exit $$?; \ cd $$i || exit $$?; \
${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \ ${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
cd .. || exit $$?; \ cd .. || exit $$?; \
done done