--- a/regexParser/Makefile	Wed Feb 03 13:56:01 2016 +0900
+++ b/regexParser/Makefile	Thu Feb 04 03:26:18 2016 +0900
@@ -1,12 +1,12 @@
-TARGET= regexParser test/ccMerge
+TARGET= regexParser test/ccMerge regexParserCbC
 CFLAGS= -Wall -O0 -g -I$(CERIUM)/include/TaskManager -I.
 SEQCFLAGS= CFLAGS= -Wall -O -g -I$(CERIUM)/include/TaskManager -I.
-CC= clang++
+CC= /Users/e105711/prog/seminar/CbC/llvmInst/bin/clang++
 CERIUM= ../../Cerium
 AR= libCeriumGrep.a
 
 SRCS_TMP = $(wildcard *.cc)
-SRCS_EXCLUDE = sequentialSearch.cc state.cc parallelSearch.cc taskInit.cc searchTask.cc main.cc
+SRCS_EXCLUDE = sequentialSearch.cc state.cc parallelSearch.cc taskInit.cc searchTask.cc main.cc stateCbC.cc sequentialSearchCbC.cc generateSequentialSearchCbC.cc sequentialSearch.cc generateSequentialSearch.cc
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
 OBJS = $(SRCS:.cc=.o)
 
@@ -25,8 +25,11 @@
 
 all: $(TARGET)
 
-regexParser: $(OBJS) main.o
-	$(CC) $(CFLAGS) -o $@ $(OBJS) main.o
+regexParser: $(OBJS) main.o sequentialSearch.o generateSequentialSearch.o
+	$(CC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearch.o
+
+regexParserCbC: $(OBJS) main.o sequentialSearchCbC.o generateSequentialSearchCbC.o
+	$(CC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearchCbC.o
 
 test/searchBit: test/searchBit.cc
 	$(CC) $(CFLAGS)  $< bitVector.cc -o $@
@@ -51,10 +54,10 @@
 
 clean:
 	rm -f $(TARGET) $(OBJS) $(AR)
-	rm -rf *~ \#* *.gcda *.gcno *.gcov state.cc  sequentialSearch *.dSYM
+	rm -rf *~ \#* *.gcda *.gcno *.gcov state.cc  sequentialSearch *.dSYM *.o stateCbC.cc sequentialSearchCbC
 	cd test; rm -rf *.o *~ \#* *.gcda *.gcno *.gcov *.dSYM
 	cd cerium; make clean
-	touch state.cc
+	touch state.cc stateCbC.cc
 
 .SUFFIXES: .cc .o
 
@@ -76,9 +79,14 @@
 sequentialSearch: sequentialSearch.cc regexParser fileread.o
 	./regexParser -seq -subset -regex $(REGEX)
 	$(CC) $(CFLAGS)  -c sequentialSearch.cc 
-	$(CC) $(SEQDFLAGS)  sequentialSearch.o $(OBJS) -o $@
+	$(CC) $(SEQDFLAGS)  sequentialSearch.o  generateSequentialSearch.o $(OBJS) -o $@
 	- ./$@ -file $(TESTFILE)
 
+sequentialSearchCbC: sequentialSearchCbC.cc regexParserCbC fileread.o
+	./regexParserCbC -seq -subset -regex $(REGEX)
+	$(CC) $(CFLAGS)  -c sequentialSearchCbC.cc 
+	$(CC) $(SEQDFLAGS)  sequentialSearchCbC.o generateSequentialSearchCbC.o $(OBJS) -o $@
+	- ./$@ -file $(TESTFILE)
 
 test1: regexParser
 	./regexParser -regex 'a'