X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=2d3161179c45a4a650402140ffaa6bfdf32d9e43;hp=ddc89cb2440926aaf0551084fe89c88a3e2bbdfa;hb=c6ecd39c5c0483a5aaa370a1b4bbd07b2af77eb2;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a

diff --git a/Makefile b/Makefile
index ddc89cb2..2d316117 100644
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,17 @@ LIB_NAME=model
 LIB_SO=lib$(LIB_NAME).so
 
 USER_O=userprog.o
-USER_H=libthreads.h libatomic.h
+USER_H=libthreads.h
 
-MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc cyclegraph.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o threads.o librace.o action.o nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o
-MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h cyclegraph.h hashtable.h
+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
+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
+MODEL_H=libthreads.h schedule.h common.h model.h threads.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h cyclegraph.h hashtable.h datarace.h config.h include/impatomic.h include/cstdatomic include/stdatomic.h cmodelint.h
 
 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
+CPPFLAGS=-Wall -g -O0 -Iinclude -I.
 LDFLAGS=-ldl -lrt
 SHARED=-shared
 
@@ -50,8 +50,8 @@ mymemory.o: mymemory.h snapshotimp.h snapshot.h mymemory.cc
 snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
 	$(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
 
-$(MODEL_O): $(MODEL_CC) $(MODEL_H)
-	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
+%.o: %.cc $(MODEL_H)
+	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
 clean:
 	rm -f $(BIN) *.o *.so