Remove useless check for config-host.mak
If config-host.mak dont' exist, we have exited in the check at the beginning of the file. Once here, move the bits to the else part of the test at the beginning of the file. Patchworks-ID: 35191 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
1215c6e761
commit
e5efe7f5d2
9
Makefile
9
Makefile
@ -5,6 +5,9 @@ ifneq ($(wildcard config-host.mak),)
|
|||||||
all: build-all
|
all: build-all
|
||||||
include config-host.mak
|
include config-host.mak
|
||||||
include $(SRC_PATH)/rules.mak
|
include $(SRC_PATH)/rules.mak
|
||||||
|
config-host.mak: configure
|
||||||
|
@echo $@ is out-of-date, running configure
|
||||||
|
@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
|
||||||
else
|
else
|
||||||
config-host.mak:
|
config-host.mak:
|
||||||
@echo "Please call configure before running make!"
|
@echo "Please call configure before running make!"
|
||||||
@ -34,12 +37,6 @@ SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
|
|||||||
build-all: config-host.h
|
build-all: config-host.h
|
||||||
$(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) $(TOOLS) $(DOCS) recurse-all,)
|
$(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) $(TOOLS) $(DOCS) recurse-all,)
|
||||||
|
|
||||||
config-host.mak: configure
|
|
||||||
ifneq ($(wildcard config-host.mak),)
|
|
||||||
@echo $@ is out-of-date, running configure
|
|
||||||
@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
|
|
||||||
endif
|
|
||||||
|
|
||||||
config-host.h: config-host.h-timestamp
|
config-host.h: config-host.h-timestamp
|
||||||
config-host.h-timestamp: config-host.mak
|
config-host.h-timestamp: config-host.mak
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user