X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=c2d7072e4c5170344cea19d35467aa537303f9cf;hb=3e29290164634f0c3dad7599df512e3890c67f2d;hp=7a21be3dc9be9d482623ed80017897e80ce025ca;hpb=ee840c902aec5c8becf8051eca7fe2b82b8ddc5b;p=model-checker.git

diff --git a/Makefile b/Makefile
index 7a21be3..c2d7072 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,4 @@
-CC=gcc
-CXX=g++
-
-LIB_NAME=model
-LIB_SO=lib$(LIB_NAME).so
-
+include common.mk
 
 MODEL_CC=libthreads.cc schedule.cc model.cc threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc cyclegraph.cc datarace.cc impatomic.cc cmodelint.cc promise.cc
 MODEL_O=libthreads.o schedule.o model.o threads.o librace.o action.o nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o datarace.o impatomic.o cmodelint.o promise.o
@@ -13,11 +8,13 @@ SHMEM_CC=snapshot.cc malloc.c mymemory.cc
 SHMEM_O=snapshot.o malloc.o mymemory.o
 SHMEM_H=snapshot.h snapshotimp.h mymemory.h
 
-CPPFLAGS=-Wall -g -O0 -Iinclude -I.
+CPPFLAGS += -Iinclude -I.
 LDFLAGS=-ldl -lrt
 SHARED=-shared
 
-all: $(LIB_SO)
+TESTS=test
+
+all: $(LIB_SO) tests
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -47,9 +44,13 @@ snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
 
 clean:
 	rm -f *.o *.so
+	$(MAKE) -C $(TESTS) clean
 
 mrclean: clean
 	rm -rf docs
 
 tags::
 	ctags -R
+
+tests:: $(LIB_SO)
+	$(MAKE) -C $(TESTS)