diff regexParser/Makefile @ 308:1188debbef10

separate CharClass
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Mon, 08 Feb 2016 12:45:45 +0900
parents 27414e6fb33c
children 1d79e61a9365
line wrap: on
line diff
--- a/regexParser/Makefile	Mon Feb 08 12:26:53 2016 +0900
+++ b/regexParser/Makefile	Mon Feb 08 12:45:45 2016 +0900
@@ -1,6 +1,6 @@
 TARGET= regexParser test/ccMerge 
 CFLAGS= -Wall -O0 -g -I$(CERIUM)/include/TaskManager -I.
-SEQCFLAGS= CFLAGS= -Wall -O -g -I$(CERIUM)/include/TaskManager -I.
+SEQCFLAGS=  -Wall -O -g -I$(CERIUM)/include/TaskManager -I.
 CC= clang++
 CbC= clang++
 CERIUM= ../../Cerium
@@ -36,7 +36,7 @@
 	$(CC) $(CFLAGS)  $< bitVector.cc -o $@
 
 test/ccMerge: test/ccMerge.o subsetConstruction.o regexParser.o node.o error.o bitVector.o
-	$(CC) $(CFLAGS)  $< subsetConstruction.o regexParser.o node.o error.o bitVector.o -o $@
+	$(CC) $(CFLAGS)  $< subsetConstruction.o regexParser.o node.o error.o bitVector.o CharClass.o -o $@
 
 parallelSearch: $(AR)
 	cd cerium ; $(MAKE) -f Makefile.macosx CERIUM=../$(CERIUM)
@@ -79,7 +79,7 @@
 
 sequentialSearch: sequentialSearch.cc regexParser fileread.o
 	./regexParser -seq -subset -regex $(REGEX)
-	$(CC) $(CFLAGS)  -c sequentialSearch.cc 
+	$(CC) $(SEQCFLAGS)  -c sequentialSearch.cc 
 	$(CC) $(SEQDFLAGS)  sequentialSearch.o  generateSequentialSearch.o $(OBJS) -o $@
 	- ./$@ -file $(TESTFILE)