quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makefile: make verbose dep check more verbose

Browse Source
This commit is contained in:
Rudolf Polzer 2010-11-16 14:06:41 +01:00
parent 5473ceccf9
commit 08f58dfd1f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -50,8 +50,9 @@ WGET ?= wget
MV ?= mv MV ?= mv
UNZIP ?= unzip UNZIP ?= unzip
STDOUT_TO_DEVNULL ?= >/dev/null FD_TO_DEVNULL ?= >/dev/null
STDERR_TO_DEVNULL ?= 2>/dev/null STDOUT_TO_DEVNULL ?= 1$(FD_TO_DEVNULL)
STDERR_TO_DEVNULL ?= 2$(FD_TO_DEVNULL)
STDERR_TO_STDOUT ?= 2>&1 STDERR_TO_STDOUT ?= 2>&1
TO_DEVNULL ?= $(STDOUT_TO_DEVNULL) $(STDERR_TO_STDOUT) TO_DEVNULL ?= $(STDOUT_TO_DEVNULL) $(STDERR_TO_STDOUT)
@ -250,12 +251,12 @@ dependencies-check:
else else
dependencies-check: dependencies-check:
@$(ECHO) @$(ECHO)
@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; exec 3>&2; else exec 3$(FD_TO_DEVNULL); fi; \
failed=0; \ failed=0; \
checkbinary() \ checkbinary() \
{ \ { \
$(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
$$2 --help $(TO_DEVNULL); \ $$2 --help >&3 $(STDERR_TO_STDOUT); \
if [ $$? != 127 ]; then \ if [ $$? != 127 ]; then \
$(ECHO) "found."; \ $(ECHO) "found."; \
else \ else \
@ -294,14 +295,14 @@ dependencies-check:
[ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \ [ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
[ "$$failed" = "0" ] && $(ECHO) All required tools have been found! [ "$$failed" = "0" ] && $(ECHO) All required tools have been found!
@$(ECHO) @$(ECHO)
@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \ @if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; exec 3>&2; else exec 3$(FD_TO_DEVNULL); fi; \
failed=0; \ failed=0; \
checkheader() \ checkheader() \
{ \ { \
$(ECHO_NOLF) "Checking for $$2 ($$1)... "; \ $(ECHO_NOLF) "Checking for $$2 ($$1)... "; \
if \ if \
$(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o $(TO_DEVNULL) && \ $(CXX) conftest.cpp $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $$4 -DCONFTEST_HEADER="<$$2>" -DCONFTEST_SYMBOL="$$3" $(TARGET_ARCH) $(LDFLAGS) -c -o conftest.o >&3 $(STDERR_TO_STDOUT) && \
$(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest $(TO_DEVNULL); \ $(CXX) conftest.o $(LDFLAGS) $(LDFLAGS_COMMON) $$5 $(LIBS_COMMON) $(LIBS) -o conftest >&3 $(STDERR_TO_STDOUT); \
then \ then \
$(RM) conftest conftest.o conftest.d; \ $(RM) conftest conftest.o conftest.d; \
$(ECHO) "found."; \ $(ECHO) "found."; \