X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=9d7acb0894b7db264e5b4bd4e90a61cff6be0a27;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=f7a01be0a344285f11e62af3de537699790ab47a;hpb=305c314f6e2e34396053c3974e3be3796a16e4e1;p=model-checker.git

diff --git a/test/Makefile b/test/Makefile
index f7a01be..9d7acb0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,15 +1,26 @@
-include ../common.mk
+BASE := ..
 
-CPPFLAGS += -I.. -I../include
-TESTS=userprog
+OBJECTS := $(patsubst %.c, %.o, $(wildcard *.c))
+OBJECTS += $(patsubst %.cc, %.o, $(wildcard *.cc))
 
-SRCS = $(wildcard *.c)
-OBJS = $(patsubst %.c,%.o,$(SRCS))
+include $(BASE)/common.mk
 
-all: $(OBJS)
+DIR := litmus
+include $(DIR)/Makefile
+
+DEPS := $(join $(addsuffix ., $(dir $(OBJECTS))), $(addsuffix .d, $(notdir $(OBJECTS))))
+
+CPPFLAGS += -I$(BASE) -I$(BASE)/include
+
+all: $(OBJECTS)
+
+-include $(DEPS)
 
 %.o: %.c
-	$(CC) -o $@ $< $(CPPFLAGS) -L.. -l$(LIB_NAME)
+	$(CC) -MMD -MF $(@D)/.$(@F).d -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(LIB_NAME)
+
+%.o: %.cc
+	$(CXX) -MMD -MF $(@D)/.$(@F).d -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(LIB_NAME)
 
 clean::
-	rm -f *.o $(TESTS)
+	rm -f $(OBJECTS) $(DEPS)