X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=9812ab47519c10831ad4aff9a1588026479d2c8a;hp=4a5360d96058701c69383197a38131f409b416dd;hb=fec9254c3747d5dde5d45e1ef81f7261c74bd5a7;hpb=996d51da9229031b9d7841c2f3d3b7629db2cba9

diff --git a/Makefile b/Makefile
index 4a5360d9..9812ab47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,56 @@
-CC=gcc
-CXX=g++
+include common.mk
 
-BIN=model
-LIB_NAME=model
-LIB_SO=lib$(LIB_NAME).so
+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 promise.o \
+	  snapshot.o malloc.o mymemory.o
 
-USER_O=userprog.o
-USER_H=libthreads.h libatomic.h
+CPPFLAGS += -Iinclude -I.
+LDFLAGS=-ldl -lrt
+SHARED=-shared
 
-MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc malloc.c threads.cc tree.cc librace.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o malloc.o threads.o tree.o librace.o
-MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h librace.h action.h
+TESTS=test
 
-CPPFLAGS=-Wall -g
-LDFLAGS=-ldl
+program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
+program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
+DEPS = make.deps
 
-all: $(BIN)
+all: $(LIB_SO) $(DEPS) tests
 
-$(BIN): $(USER_O) $(LIB_SO)
-	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) $(CPPFLAGS)
+$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
+	$(CXX) $(CPPFLAGS) -MM $(program_C_SRCS) > $(DEPS)
 
-# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
+include $(DEPS)
 
-$(LIB_SO): $(MODEL_O) $(MODEL_H)
-	$(CXX) -shared -Wl,-soname,$(LIB_SO) -o $(LIB_SO) $(MODEL_O) $(LDFLAGS) $(CPPFLAGS)
+debug: CPPFLAGS += -DCONFIG_DEBUG
+debug: all
 
-$(MODEL_O): $(MODEL_CC) $(MODEL_H)
-	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
+mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
+mac: LDFLAGS=-ldl
+mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
+mac: all
+
+docs: *.c *.cc *.h
+	doxygen
+
+$(LIB_SO): $(OBJECTS)
+	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
+
+malloc.o: malloc.c
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
+
+%.o: %.cc
+	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
 clean:
-	rm -f $(BIN) *.o *.so
+	rm -f *.o *.so
+	$(MAKE) -C $(TESTS) clean
+
+mrclean: clean
+	rm -rf docs
 
 tags::
 	ctags -R
+
+tests:: $(LIB_SO)
+	$(MAKE) -C $(TESTS)