[newlib-cygwin] Cygwin: Makefile.in: Fix previous version info generation fix

Corinna Vinschen corinna@sourceware.org
Sat Feb 2 14:29:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2cd6829619290e12095eaeed21aa1a431116d71a

commit 2cd6829619290e12095eaeed21aa1a431116d71a
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Sat Feb 2 15:10:13 2019 +0100

    Cygwin: Makefile.in: Fix previous version info generation fix
    
    Commit 231ad6941f9ade7bde67d27929da5a776ebd9457 looks good...
    as long as you never build Cygwin from scratch.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/Makefile.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index f94edb9..c14eea3 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -766,11 +766,12 @@ ${EXTRALIBS}: lib%.a: %.o
 find_src_files = $(wildcard $(dir)/*.[chS]) $(wildcard $(dir)/*.cc)
 src_files := $(foreach dir,$(VPATH),$(find_src_files))
 
-winver.o: mkvers.sh include/cygwin/version.h winver.rc $(src_files)
+# mkvers.sh creates version.cc in the first place, winver.o always
+# second, so version.cc is always older than winver.o
+version.cc: mkvers.sh include/cygwin/version.h winver.rc $(src_files)
 	@echo "Making version.cc and winver.o";\
 	/bin/sh ${word 1,$^} ${word 2,$^} ${word 3,$^} $(WINDRES) ${CFLAGS} $(addprefix -I,${CCWRAP_SYSTEM_HEADERS} ${CCWRAP_DIRAFTER_HEADERS})
-
-version.o: winver.o
+$(VERSION_OFILES): version.cc
 
 Makefile: ${srcdir}/Makefile.in
 	/bin/sh ./config.status



More information about the Cygwin-cvs mailing list