[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 11/61] Makefile: use $(MAKE) variable
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 11/61] Makefile: use $(MAKE) variable |
Date: |
Mon, 18 Dec 2017 00:27:16 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
For some systems (i.e. FreeBSD) the default 'make' is not compatible with the
GNU extensions used by QEMU makefiles.
Calling the GNU make (gmake) works, however the help displayed refers to the
host 'make' and copy/paste leads to lot of unobvious errors:
$ gmake check-help
[...]
make check Run all tests
$ make check
make: "Makefile" line 28: Missing dependency operator
make: "Makefile" line 37: Need an operator
make: "Makefile" line 41: warning: duplicate script for target
"git-submodule-update" ignored
make: "rules.mak" line 70: warning: duplicate script for target "%.o" ignored
make: Unknown modifier ' '
make: Unclosed substitution for eval modules (= missing)
make: "tests/Makefile.include" line 24: Variable/Value missing from "export"
make: "tests/" line 1: warning: Zero byte read from file, skipping rest of
line.
make: "tests/" line 1: Need an operator
make: "Makefile" line 660: warning: duplicate script for target "ifneq"
ignored
make: "Makefile" line 78: warning: using previous script for "ifneq" defined
here
make: Fatal errors encountered -- cannot continue
Using the $(MAKE) variable, the help displayed is consistent with the 'make'
program used.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
Makefile | 6 +++---
tests/Makefile.include | 20 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 0331c182ed..1f93515677 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ ifneq ($(realpath $(SRC_PATH)),$(realpath .))
ifneq ($(wildcard $(SRC_PATH)/config-host.mak),)
$(error This is an out of tree build but your source tree ($(SRC_PATH)) \
seems to have been used for an in-tree build. You can fix this by running \
-"make distclean && rm -rf *-linux-user *-softmmu" in your source tree)
+"$(MAKE) distclean && rm -rf *-linux-user *-softmmu" in your source tree)
endif
endif
@@ -304,7 +304,7 @@ endif
else \
echo "WARNING: $@ out of date.";\
fi; \
- echo "Run \"make defconfig\" to regenerate."; \
+ echo "Run \"$(MAKE) defconfig\" to regenerate."; \
rm address@hidden; \
fi; \
else \
@@ -934,4 +934,4 @@ ifdef QEMU_GA_MSI_ENABLED
endif
@echo ''
endif
- @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose
build'
+ @echo ' $(MAKE) V=0|1 [targets] 0 => quiet build (default), 1 =>
verbose build'
diff --git a/tests/Makefile.include b/tests/Makefile.include
index c002352134..b4bcc872f2 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -3,21 +3,21 @@
check-help:
@echo "Regression testing targets:"
@echo
- @echo " make check Run all tests"
- @echo " make check-qtest-TARGET Run qtest tests for given target"
- @echo " make check-qtest Run qtest tests"
- @echo " make check-unit Run qobject tests"
- @echo " make check-speed Run qobject speed tests"
- @echo " make check-qapi-schema Run QAPI schema tests"
- @echo " make check-block Run block tests"
- @echo " make check-report.html Generates an HTML test report"
- @echo " make check-clean Clean the tests"
+ @echo " $(MAKE) check Run all tests"
+ @echo " $(MAKE) check-qtest-TARGET Run qtest tests for given target"
+ @echo " $(MAKE) check-qtest Run qtest tests"
+ @echo " $(MAKE) check-unit Run qobject tests"
+ @echo " $(MAKE) check-speed Run qobject speed tests"
+ @echo " $(MAKE) check-qapi-schema Run QAPI schema tests"
+ @echo " $(MAKE) check-block Run block tests"
+ @echo " $(MAKE) check-report.html Generates an HTML test report"
+ @echo " $(MAKE) check-clean Clean the tests"
@echo
@echo "Please note that HTML reports do not regenerate if the unit
tests"
@echo "has not changed."
@echo
@echo "The variable SPEED can be set to control the gtester speed
setting."
- @echo "Default options are -k and (for make V=1) --verbose; they can be"
+ @echo "Default options are -k and (for $(MAKE) V=1) --verbose; they can
be"
@echo "changed with variable GTESTER_OPTIONS."
ifneq ($(wildcard config-host.mak),)
--
2.11.0
- [Qemu-trivial] [PULL 45/61] hw/ipmi: remove old i386 dependency, (continued)
- [Qemu-trivial] [PULL 45/61] hw/ipmi: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 27/61] MAINTAINERS: add missing entry for include/hw/net/, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 42/61] amd_iommu: avoid needless includes in header file, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 29/61] hw: remove "qemu/osdep.h" from header files, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 09/61] memory: remove unused memory_region_set_global_locking(), Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 53/61] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 43/61] misc: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 58/61] hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h", Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 54/61] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h", Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 61/61] misc: drop old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 11/61] Makefile: use $(MAKE) variable,
Michael Tokarev <=
- [Qemu-trivial] [PULL 32/61] misc: remove duplicated includes, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 21/61] MAINTAINERS: add an entry for the i82374 (southbridge), Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 26/61] MAINTAINERS: add entries for timer/m48t59, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 03/61] disas/arm: fix 'instuction' typo in comment, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 25/61] MAINTAINERS: add an entry for input/pckbd.c, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 57/61] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 44/61] hw/ide: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 28/61] hw: use "qemu/osdep.h" as first #include in source files, Michael Tokarev, 2017/12/18
- [Qemu-trivial] [PULL 56/61] hw/display/vga: extract public API from i386/pc to "hw/display/vga.h", Michael Tokarev, 2017/12/18
- [Qemu-trivial] [PULL v3 00/60] Trivial patches for 2017-12-18, Michael Tokarev, 2017/12/18