tests: Makefile: eliminate (some) recursive make

[model-checker.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index f7a01be0a344285f11e62af3de537699790ab47a..5e5e76c6c2b546e197ec3d32b220c6e20a32d857 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,15 +1,22 @@
-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
+
+CPPFLAGS += -I$(BASE) -I$(BASE)/include
+
+all: $(OBJECTS)
 
 %.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 $(OBJECTS)