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

diff --git a/test/Makefile b/test/Makefile
index f7a01be..f1ea5b2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,15 +1,24 @@
-include ../common.mk
+BASE = ..
 
-CPPFLAGS += -I.. -I../include
-TESTS=userprog
+include $(BASE)/common.mk
+
+CPPFLAGS += -I$(BASE) -I$(BASE)/include
 
 SRCS = $(wildcard *.c)
-OBJS = $(patsubst %.c,%.o,$(SRCS))
+CPSRCS = $(wildcard *.cc)
+OBJS = $(patsubst %.c,%.o,$(SRCS)) $(patsubst %.cc,%.o,$(CPSRCS))
+
+all: $(OBJS) litmus-tests
 
-all: $(OBJS)
+litmus-tests::
+	$(MAKE) -C litmus
 
 %.o: %.c
-	$(CC) -o $@ $< $(CPPFLAGS) -L.. -l$(LIB_NAME)
+	$(CC) -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(LIB_NAME)
+
+%.o: %.cc
+	$(CXX) -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(LIB_NAME)
 
 clean::
-	rm -f *.o $(TESTS)
+	rm -f *.o
+	$(MAKE) -C litmus clean