From af2f351869efb997c6ad6b62c12f48f7578ab208 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 16 Feb 2006 05:10:48 +0000 Subject: [PATCH] Fix a minor makefile bug with lex/yacc handling that nate noticed. We don't want to copy the files when the .cpp file changes, we want to copy them to the .cvs versions when the .l/.y file change (like the comments even say). This avoids having bogus changes show up in diffs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26229 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 1b5600b2988d..be2bafc30f20 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1231,7 +1231,7 @@ $(PROJ_SRC_DIR)/%.cpp: $(PROJ_SRC_DIR)/%.l # source location and building them. $(LexFiles:%.l=$(PROJ_SRC_DIR)/%.cpp.cvs): \ $(PROJ_SRC_DIR)/%.cpp.cvs: $(PROJ_SRC_DIR)/%.cpp - $(Verb) $(CMP) -s $@ $< || \ + $(Verb) $(CMP) -s $(PROJ_SRC_DIR)/$*.l $(PROJ_SRC_DIR)/$*.l.cvs || \ ($(CP) $< $@; $(CP) $(PROJ_SRC_DIR)/$*.l $(PROJ_SRC_DIR)/$*.l.cvs) $(LexFiles:%.l=$(ObjDir)/%.o) : \ @@ -1272,7 +1272,7 @@ $(PROJ_SRC_DIR)/%.cpp $(PROJ_SRC_DIR)/%.h : $(PROJ_SRC_DIR)/%.y # to the source location and building them. $(YaccFiles:%.y=$(PROJ_SRC_DIR)/%.cpp.cvs): \ $(PROJ_SRC_DIR)/%.cpp.cvs: $(PROJ_SRC_DIR)/%.cpp - $(Verb) $(CMP) -s $@ $< || \ + $(Verb) $(CMP) -s $(PROJ_SRC_DIR)/$*.y $(PROJ_SRC_DIR)/$*.y.cvs || \ ($(CP) $< $@; \ $(CP) $(PROJ_SRC_DIR)/$*.y $(PROJ_SRC_DIR)/$*.y.cvs; \ $(CP) $(PROJ_SRC_DIR)/$*.h $(PROJ_SRC_DIR)/$*.h.cvs)