Removed mixed-criticality codewip-color-jlh

1 files changed, 15 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 6b1feed..5527862 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ host-arch := $(shell uname -m | \
 ARCH ?= ${host-arch}
 
 # LITMUS_KERNEL -- where to find the litmus kernel?
-LITMUS_KERNEL ?= ../litmus-rt
+LITMUS_KERNEL ?= ../backup-litmus-rt
 
 
 # ##############################################################################
@@ -71,8 +71,8 @@ AR  := ${CROSS_COMPILE}${AR}
 # Targets
 
 all     = lib ${rt-apps}
-rt-apps = cycles base_task rt_launch locktest rtspin rtspin.ovh rtspin.beta release_ts \
-          measure_syscall base_mt_task runtests bespin
+rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
+          base_mt_task runtests colortest colorbench testcounters bespin
 
 .PHONY: all lib clean dump-config TAGS tags cscope help
 
@@ -155,7 +155,7 @@ arch/${include-${ARCH}}/include/asm/%.h: \
         cp $< $@
 
 litmus-headers = include/litmus/rt_param.h include/litmus/unistd_32.h \
-        include/litmus/unistd_64.h include/litmus/sched_mc.h include/litmus/color.h
+        include/litmus/unistd_64.h include/litmus/color.h
 
 unistd-headers = \
   $(foreach file,${unistd-${ARCH}},arch/${include-${ARCH}}/include/asm/$(file))
@@ -230,12 +230,21 @@ lib-locktest = -lrt -pthread
 obj-measure_syscall = null_call.o
 lib-measure_syscall = -lm
 
+obj-colortest = colortest.o color.o
+lib-colortest = -static
+
+obj-colorbench = colorbench.o color.o perfcounters.o common.o
+lib-colorbench = -lpthread -lrt -lgsl -lgslcblas
+
+obj-testcounters = testcounters.o
+lib-testcounters =
+
 # ##############################################################################
 # Build everything that depends on liblitmus.
 
 .SECONDEXPANSION:
 ${rt-apps}: $${obj-$$@} liblitmus.a
-        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${lib-$@} ${liblitmus-flags}
+        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${liblitmus-flags} ${lib-$@}
 
 # ##############################################################################
 # Dependency resolution.
@@ -273,7 +282,7 @@ $(error Cannot build without access to the LITMUS^RT kernel source)
 endif
 
 kernel-unistd-hdrs := $(foreach file,${unistd-headers},${LITMUS_KERNEL}/$(file))
-hdr-ok     := $(shell egrep '\#include ["<]litmus/unistd' ${kernel-unistd-hdrs} )
+hdr-ok     := $(shell egrep '\#include .*litmus/unistd' ${kernel-unistd-hdrs} )
 ifeq ($(strip $(hdr-ok)),)
 $(info (!!) Could not find LITMUS^RT system calls in ${kernel-unistd-hdrs}.)
 $(error Your kernel headers do not seem to be LITMUS^RT headers)
@@ -290,4 +299,3 @@ $(error Cannot build without access to the architecture-specific files)
 endif
 
 endif
-