Makefile: rewrite header dependencies

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index de9051cfda92d7d75e1ef4e1b7fbaf6448a3d3e8..9812ab47519c10831ad4aff9a1588026479d2c8a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,51 +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 threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.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
-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
+TESTS=test
 
-SHMEM_CC=snapshot.cc malloc.c mymemory.cc
-SHMEM_O=snapshot.o malloc.o mymemory.o
-SHMEM_H=snapshot.h snapshotimp.h mymemory.h
+program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
+program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
+DEPS = make.deps
 
-CPPFLAGS=-Wall -g
-LDFLAGS=-ldl -lrt
+all: $(LIB_SO) $(DEPS) tests
 
-all: $(BIN)
+$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
+       $(CXX) $(CPPFLAGS) -MM $(program_C_SRCS) > $(DEPS)
+
+include $(DEPS)
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-$(BIN): $(USER_O) $(LIB_SO)
-       $(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME)
+mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
+mac: LDFLAGS=-ldl
+mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
+mac: all
 
-# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
+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 mymemory.cc
-       $(CXX) -fPIC -c mymemory.cc $(CPPFLAGS)
-
-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
+       $(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)