Fix Makefile to use thrifty.yy and thriftl.ll

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664946 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/compiler/cpp/Makefile.mcslee b/compiler/cpp/Makefile.mcslee
index 3b9be48..218731c 100644 (file)
--- a/compiler/cpp/Makefile.mcslee
+++ b/compiler/cpp/Makefile.mcslee
@@ -42,15 +42,15 @@ SRC_FILES = main.cc \
             generate/t_cpp_generator.cc
 
 # Autogenerated files
-GEN_FILES = thrift.tab.hh \
-            thrift.tab.cc \
+GEN_FILES = thrifty.tab.hh \
+            thrifty.tab.cc \
             lex.yy.cc
 
 # Object files
 OBJ_FILES = ${SRC_FILES:.cc=.o}
 
 # Generated object files
-GOB_FILES = thrift.tab.o \
+GOB_FILES = thrifty.tab.o \
             lex.yy.o
 
 # Apply directory prefixes
@@ -75,17 +75,17 @@ $(OBJ_DIR)generate:
        $(MKDIR) -p $(OBJ_DIR)generate
 
 # Scanner generation
-$(GEN_DIR)lex.yy.cc: $(SRC_DIR)thrift.l
-       $(LEX) -o$@ $(SRC_DIR)thrift.l
+$(GEN_DIR)lex.yy.cc: $(SRC_DIR)thriftl.ll
+       $(LEX) -o$@ $(SRC_DIR)thriftl.ll
 $(OBJ_DIR)lex.yy.o: $(GEN_DIR)lex.yy.cc
        $(CC) $(CFL) -c -o $@ $(GEN_DIR)lex.yy.cc
 
 # Parser generation
-$(GEN_DIR)thrift.tab.hh: $(GEN_DIR)thrift.tab.cc
-$(GEN_DIR)thrift.tab.cc: $(SRC_DIR)thrift.y
-       $(YACC) -d -o$(GEN_DIR)thrift.tab.cc $(SRC_DIR)thrift.y
-$(OBJ_DIR)thrift.tab.o: $(GEN_DIR)thrift.tab.cc
-       $(CC) $(CFL) -c -o $@ $(GEN_DIR)thrift.tab.cc
+$(GEN_DIR)thrifty.tab.hh: $(GEN_DIR)thrifty.tab.cc
+$(GEN_DIR)thrifty.tab.cc: $(SRC_DIR)thrifty.yy
+       $(YACC) -d -o$(GEN_DIR)thrifty.tab.cc $(SRC_DIR)thrifty.yy
+$(OBJ_DIR)thrifty.tab.o: $(GEN_DIR)thrifty.tab.cc
+       $(CC) $(CFL) -c -o $@ $(GEN_DIR)thrifty.tab.cc
 
 # C++ compilation
 $(OBJS): $(SRCS)