X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=2acdbc7dff8a7738c6f99349421aa66bc97b5d5b;hb=f001f8b98c907df8bd7f38e92c00445071f26304;hp=6a85ee8d2a611c803ce431c2a3267f6fd3b3f7b4;hpb=c7affe0434c47a25fb4b571136aea6089ac75592;p=model-checker.git

diff --git a/Makefile b/Makefile
index 6a85ee8..2acdbc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,26 @@
 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
-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 promise.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
+OBJECTS = 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 \
+	  snapshot.o malloc.o mymemory.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS=-ldl -lrt
 SHARED=-shared
 
-all: $(LIB_SO)
+TESTS=test
+
+program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
+program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
+DEPS = make.deps
+
+all: $(LIB_SO) $(DEPS) tests
+
+$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
+	$(CXX) $(CPPFLAGS) -MM $(program_C_SRCS) > $(DEPS)
+
+include $(DEPS)
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -25,26 +33,24 @@ mac: all
 docs: *.c *.cc *.h
 	doxygen
 
-$(LIB_SO): $(MODEL_O) $(MODEL_H) $(SHMEM_O) $(SHMEM_H)
-	$(CXX) $(SHARED) -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(LDFLAGS)
+$(LIB_SO): $(OBJECTS)
+	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
 
 malloc.o: malloc.c
 	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
 
-mymemory.o: mymemory.h snapshotimp.h snapshot.h mymemory.cc
-	$(CXX) -fPIC -c mymemory.cc $(CPPFLAGS)
-
-snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
-	$(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
-
-%.o: %.cc $(MODEL_H)
+%.o: %.cc
 	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
 clean:
 	rm -f *.o *.so
+	$(MAKE) -C $(TESTS) clean
 
 mrclean: clean
 	rm -rf docs
 
 tags::
 	ctags -R
+
+tests:: $(LIB_SO)
+	$(MAKE) -C $(TESTS)