diff regexParser/Makefile @ 302:27414e6fb33c

retrying blocked search fix for CbC support
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 08 Feb 2016 08:59:38 +0900
parents 4cb6eea3ab12
children 1188debbef10
line wrap: on
line diff
--- a/regexParser/Makefile	Thu Feb 04 03:26:18 2016 +0900
+++ b/regexParser/Makefile	Mon Feb 08 08:59:38 2016 +0900
@@ -1,12 +1,13 @@
-TARGET= regexParser test/ccMerge regexParserCbC
+TARGET= regexParser test/ccMerge 
 CFLAGS= -Wall -O0 -g -I$(CERIUM)/include/TaskManager -I.
 SEQCFLAGS= CFLAGS= -Wall -O -g -I$(CERIUM)/include/TaskManager -I.
-CC= /Users/e105711/prog/seminar/CbC/llvmInst/bin/clang++
+CC= clang++
+CbC= clang++
 CERIUM= ../../Cerium
 AR= libCeriumGrep.a
 
 SRCS_TMP = $(wildcard *.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_EXCLUDE = sequentialSearch.cc state.cc parallelSearch.cc taskInit.cc searchTask.cc main.cc stateCbC.cc sequentialSearchCbC.cc generateSequentialSearchCbC.cc sequentialSearch.cc generateSequentialSearch.cc sequentialSearchCbC.cc
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
 OBJS = $(SRCS:.cc=.o)
 
@@ -29,7 +30,7 @@
 	$(CC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearch.o
 
 regexParserCbC: $(OBJS) main.o sequentialSearchCbC.o generateSequentialSearchCbC.o
-	$(CC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearchCbC.o
+	$(CbC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearchCbC.o
 
 test/searchBit: test/searchBit.cc
 	$(CC) $(CFLAGS)  $< bitVector.cc -o $@
@@ -84,8 +85,8 @@
 
 sequentialSearchCbC: sequentialSearchCbC.cc regexParserCbC fileread.o
 	./regexParserCbC -seq -subset -regex $(REGEX)
-	$(CC) $(CFLAGS)  -c sequentialSearchCbC.cc 
-	$(CC) $(SEQDFLAGS)  sequentialSearchCbC.o generateSequentialSearchCbC.o $(OBJS) -o $@
+	$(CbC) $(CFLAGS)  -c sequentialSearchCbC.cc 
+	$(CbC) $(SEQDFLAGS)  sequentialSearchCbC.o generateSequentialSearchCbC.o $(OBJS) -o $@
 	- ./$@ -file $(TESTFILE)
 
 test1: regexParser