X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=adb080de5d44871596ee201fb659666684645bbc;hp=a1d0d27a4a43dbacb1f7e5f856b59ce116689752;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=6f00cf7293dd0b42cad96855604287f6814f36d8

diff --git a/Makefile b/Makefile
index a1d0d27a..adb080de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 include common.mk
 
 OBJECTS := libthreads.o schedule.o model.o threads.o librace.o action.o \
-	   clockvector.o main.o snapshot-interface.o cyclegraph.o \
+	   clockvector.o main.o cyclegraph.o \
 	   datarace.o impatomic.o cmodelint.o \
 	   snapshot.o malloc.o mymemory.o common.o mutex.o conditionvariable.o \
 	   context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
-	   sleeps.o history.o funcnode.o funcinst.o printf.o
+	   sleeps.o history.o funcnode.o funcinst.o predicate.o printf.o newfuzzer.o \
+	   concretepredicate.o waitobj.o hashfunction.o pipe.o actionlist.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic -lpthread
@@ -17,11 +18,9 @@ LDFLAGS := -ldl
 SHARED := -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
 
-TESTS_DIR := test
-
 MARKDOWN := doc/Markdown/Markdown.pl
 
-all: $(LIB_SO) tests README.html
+all: $(LIB_SO) README.html
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -57,7 +56,6 @@ $(LIB_SO): $(OBJECTS)
 PHONY += clean
 clean:
 	rm -f *.o *.so .*.d *.pdf *.dot
-	$(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean
 mrclean: clean
@@ -67,10 +65,6 @@ PHONY += tags
 tags:
 	ctags -R
 
-PHONY += tests
-tests: $(LIB_SO)
-#	$(MAKE) -C $(TESTS_DIR)
-
 BENCH_DIR := benchmarks
 
 PHONY += benchmarks