From 1a3b0d5fed935d85787e6902c5fa6f3bf48011dd Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Sat, 25 Jan 2014 08:55:31 -0800 Subject: [PATCH] Fixed dependency problem for qstrdefs.generated.h The problem manifests itself in make 4.0 I also fixed the LINK message when linking the final executable for unix and unix-cpy. --- py/mkrules.mk | 2 +- py/py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py/mkrules.mk b/py/mkrules.mk index 4c1ea08332..1ab3ee59ba 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -65,7 +65,7 @@ ifneq ($(PROG),) all: $(PROG) $(PROG): $(OBJ) - $(ECHO) "LINK $<" + $(ECHO) "LINK $@" $(Q)$(CC) -o $@ $(OBJ) $(LIB) $(LDFLAGS) ifndef DEBUG $(Q)strip $(PROG) diff --git a/py/py.mk b/py/py.mk index 742e6e398e..35dfd590ac 100644 --- a/py/py.mk +++ b/py/py.mk @@ -78,7 +78,7 @@ PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) # Adding an order only dependency on $(PY_BUILD) causes $(PY_BUILD) to get # created before we run the script to generate the .h -$(PY_BUILD)/qstrdefs.generated.h: | $(PY_BUILD) +$(PY_BUILD)/qstrdefs.generated.h: | $(PY_BUILD)/ $(PY_BUILD)/qstrdefs.generated.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(PY_SRC)/makeqstrdata.py $(ECHO) "makeqstrdata $(PY_QSTR_DEFS) $(QSTR_DEFS)" $(Q)python $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@