From: Brian Norris <banorris@uci.edu>
Date: Wed, 16 Jan 2013 07:43:44 +0000 (-0800)
Subject: tests: litmus: link up Makefile properly
X-Git-Tag: oopsla2013~358
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;ds=sidebyside;h=99615e253bda3bef29f0f3808453aa7f12a76582;p=model-checker.git

tests: litmus: link up Makefile properly

Now this builds the litmus tests properly.
---

diff --git a/test/Makefile b/test/Makefile
index c918368..f1ea5b2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,7 +8,10 @@ SRCS = $(wildcard *.c)
 CPSRCS = $(wildcard *.cc)
 OBJS = $(patsubst %.c,%.o,$(SRCS)) $(patsubst %.cc,%.o,$(CPSRCS))
 
-all: $(OBJS)
+all: $(OBJS) litmus-tests
+
+litmus-tests::
+	$(MAKE) -C litmus
 
 %.o: %.c
 	$(CC) -o $@ $< $(CPPFLAGS) -L$(BASE) -l$(LIB_NAME)
@@ -18,3 +21,4 @@ all: $(OBJS)
 
 clean::
 	rm -f *.o
+	$(MAKE) -C litmus clean