Merge remote-tracking branch 'origin/wip-color' into wip-color

Conflicts:
	Makefile

1 files changed, 5 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 5527862..b4600fc 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ AR  := ${CROSS_COMPILE}${AR}
 
 all     = lib ${rt-apps}
 rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
-          base_mt_task runtests colortest colorbench testcounters bespin
+          base_mt_task runtests colortest colorbench testcounters singlepage
 
 .PHONY: all lib clean dump-config TAGS tags cscope help
 
@@ -236,6 +236,9 @@ lib-colortest = -static
 obj-colorbench = colorbench.o color.o perfcounters.o common.o
 lib-colorbench = -lpthread -lrt -lgsl -lgslcblas
 
+obj-singlepage = singlepage.o color.o perfcounters.o common.o
+lib-singlepage =
+
 obj-testcounters = testcounters.o
 lib-testcounters =
 
@@ -244,7 +247,7 @@ lib-testcounters =
 
 .SECONDEXPANSION:
 ${rt-apps}: $${obj-$$@} liblitmus.a
-        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${liblitmus-flags} ${lib-$@}
+        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${lib-$@} ${liblitmus-flags}
 
 # ##############################################################################
 # Dependency resolution.