X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FMakefile;h=5e5e76c6c2b546e197ec3d32b220c6e20a32d857;hb=8349c08d00575cdee39e94796d33fb4c44ddd50b;hp=f1ea5b295d110f81090bf2807b2aeb25c2b9f8bc;hpb=741d3d1160343d8545a783a2d05d3d0562b1c737;p=model-checker.git

diff --git a/test/Makefile b/test/Makefile
index f1ea5b2..5e5e76c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,17 +1,16 @@
-BASE = ..
+BASE := ..
 
-include $(BASE)/common.mk
+OBJECTS := $(patsubst %.c, %.o, $(wildcard *.c))
+OBJECTS += $(patsubst %.cc, %.o, $(wildcard *.cc))
 
-CPPFLAGS += -I$(BASE) -I$(BASE)/include
+include $(BASE)/common.mk
 
-SRCS = $(wildcard *.c)
-CPSRCS = $(wildcard *.cc)
-OBJS = $(patsubst %.c,%.o,$(SRCS)) $(patsubst %.cc,%.o,$(CPSRCS))
+DIR := litmus
+include $(DIR)/Makefile
 
-all: $(OBJS) litmus-tests
+CPPFLAGS += -I$(BASE) -I$(BASE)/include
 
-litmus-tests::
-	$(MAKE) -C litmus
+all: $(OBJECTS)
 
 %.o: %.c
 	$(CC) -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(LIB_NAME)
@@ -20,5 +19,4 @@ litmus-tests::
 	$(CXX) -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(LIB_NAME)
 
 clean::
-	rm -f *.o
-	$(MAKE) -C litmus clean
+	rm -f $(OBJECTS)