diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2007-05-17 22:42:28 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2007-05-17 22:42:28 +0000 |
| commit | 2761fc4218d9d6f1f95e7adbad46348eb754a284 (patch) | |
| tree | d8be9ac5deccbcd58fe2e88053db69613b7a8246 | |
| parent | 71d2f0cb99089ddf869f7fce8a032d609fcdc1ed (diff) | |
Fix the rules for handling the case when BISON is not available. We want
this to succeed by copying the .h.cvs file to .h and the .cpp.cvs file to
.cpp.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_20@37187 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules index 888c5bdf04..d83f2fa548 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1359,15 +1359,12 @@ all:: $(YaccFiles:%.y=$(PROJ_SRC_DIR)/%.cpp.cvs) %.h: %.y # Rule for building the bison based parsers... -$(PROJ_SRC_DIR)/%.cpp $(PROJ_SRC_DIR)/%.h : $(PROJ_SRC_DIR)/%.y ifneq ($(BISON),) +$(PROJ_SRC_DIR)/%.cpp $(PROJ_SRC_DIR)/%.h : $(PROJ_SRC_DIR)/%.y $(Echo) "Bisoning $*.y" $(Verb) $(BISON) -v -d -p $(<F:%Parser.y=%) -o $*.tab.c $< $(Verb) $(MV) -f $*.tab.c $(PROJ_SRC_DIR)/$*.cpp $(Verb) $(MV) -f $*.tab.h $(PROJ_SRC_DIR)/$*.h -else - $(Echo) "Bison of $*.y SKIPPED -- bison not found" -endif # IFF the .y file has changed since it was last checked into CVS, copy the .y # file to .y.cvs and the generated .cpp/.h file to .cpp.cvs/.h.cvs. We use this @@ -1380,6 +1377,16 @@ $(PROJ_SRC_DIR)/%.cpp.cvs: $(PROJ_SRC_DIR)/%.cpp $(CP) $(PROJ_SRC_DIR)/$*.y $(PROJ_SRC_DIR)/$*.y.cvs; \ $(CP) $(PROJ_SRC_DIR)/$*.h $(PROJ_SRC_DIR)/$*.h.cvs) +else +$(PROJ_SRC_DIR)/%.cpp : $(PROJ_SRC_DIR)/%.cpp.cvs + $(Echo) "Bison of $*.y SKIPPED, bison not found -- copying .cpp.cvs" + $(Verb)$(CP) $(PROJ_SRC_DIR)/$*.cpp.cvs $(PROJ_SRC_DIR)/$*.cpp + +$(PROJ_SRC_DIR)/%.h : $(PROJ_SRC_DIR)/%.h.cvs + $(Echo) "Bison of $*.y SKIPPED, bison not found -- copying .h.cvs" + $(Verb)$(CP) $(PROJ_SRC_DIR)/$*.h.cvs $(PROJ_SRC_DIR)/$*.h +endif + $(YaccFiles:%.y=$(ObjDir)/%.o): $(ObjDir)/%.o : $(PROJ_SRC_DIR)/%.cpp |