diff regexParser/Makefile @ 312:c9ac6f06e706

add loop
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Tue, 09 Feb 2016 10:59:22 +0900
parents 1d79e61a9365
children c4d33b7c3ccd
line wrap: on
line diff
--- a/regexParser/Makefile	Mon Feb 08 22:12:14 2016 +0900
+++ b/regexParser/Makefile	Tue Feb 09 10:59:22 2016 +0900
@@ -7,7 +7,7 @@
 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 
 SRCS = $(filter-out $(SRCS_EXCLUDE),$(SRCS_TMP))
 OBJS = $(SRCS:.cc=.o)
 
@@ -26,11 +26,8 @@
 
 all: $(TARGET)
 
-regexParser: $(OBJS) main.o sequentialSearch.o generateSequentialSearch.o
-	$(CC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearch.o
-
-regexParserCbC: $(OBJS) main.o generateSequentialSearchCbC.o
-	$(CbC) $(CFLAGS) -o $@ $(OBJS) main.o generateSequentialSearchCbC.o
+regexParser: $(OBJS) main.o  $(AR)
+	$(CC) $(CFLAGS) -o $@ $(AR) main.o 
 
 test/searchBit: test/searchBit.cc
 	$(CC) $(CFLAGS)  $< bitVector.cc -o $@
@@ -55,7 +52,7 @@
 
 clean:
 	rm -f $(TARGET) $(OBJS) $(AR)
-	rm -rf *~ \#* *.gcda *.gcno *.gcov state.cc  sequentialSearch *.dSYM *.o stateCbC.cc sequentialSearchCbC
+	rm -rf *~ \#* *.gcda *.gcno *.gcov state.cc  sequentialSearch *.dSYM *.o stateCbC.cc sequentialCbC
 	cd test; rm -rf *.o *~ \#* *.gcda *.gcno *.gcov *.dSYM
 	cd cerium; make clean
 	touch state.cc stateCbC.cc
@@ -71,23 +68,27 @@
 test2: regexParser $(TESTFILE)
 	./regexParser $(SUBSET) -regex $(REGEX)-file $(TESTFILE) $(WC)
 
-seqtest: sequentialSearch $(TESTFILE)
-	./sequentialSearch -file $(TESTFILE) $(WC)
-
 grepWalk: regexParser $(TESTFILE)
 	./regexParser $(SUBSET)  -regex $(REGEX) -file $(TESTFILE) $(WC)
 
-sequentialSearch: sequentialSearch.cc regexParser fileread.o
+sequentialSearch: sequentialSearch.cc regexParser $(AR) $(TESTFILE)
 	./regexParser -seq -subset -regex $(REGEX)
 	$(CC) $(SEQCFLAGS)  -c sequentialSearch.cc 
-	$(CC) $(SEQDFLAGS)  sequentialSearch.o  generateSequentialSearch.o $(OBJS) -o $@
-	- ./$@ -file $(TESTFILE)
+	$(CC) $(SEQDFLAGS)  sequentialSearch.o $(AR) -o $@
+	- ./$@ -file $(TESTFILE) $(WC)
 
-sequentialSearchCbC: sequentialSearchCbC.cc regexParserCbC fileread.o $(TESTFILE)
-	./regexParserCbC -seq -subset -regex $(REGEX)
+sequentialLoop: sequentialSearch.cc regexParser $(AR) $(TESTFILE)
+	./regexParser -loop -subset -regex $(REGEX)
+	$(CC) $(SEQCFLAGS)  -c sequentialSearch.cc 
+	$(CC) $(SEQDFLAGS)  sequentialSearch.o $(AR) -o $@
+	- ./$@ -file $(TESTFILE) $(WC)
+
+
+sequentialCbC: sequentialSearchCbC.cc regexParser $(AR) $(TESTFILE)
+	./regexParserCbC -cbc -subset -regex $(REGEX)
 	$(CbC) $(SEQCFLAGS)  -O1 -c sequentialSearchCbC.cc 
-	$(CbC) $(SEQDFLAGS)  sequentialSearchCbC.o generateSequentialSearchCbC.o $(OBJS) -o $@
-	- ./$@ -file $(TESTFILE)
+	$(CbC) $(SEQDFLAGS)  sequentialSearchCbC.o $(AR)  -o $@
+	- ./$@ -file $(TESTFILE) $(WC)
 
 test1: regexParser
 	./regexParser -regex 'a'