Merge branch 'sd-vbs' of ssh://rtsrv.cs.unc.edu/public/mc2-scripts-and-benchmarks into sd-vbs

1 files changed, 5 insertions, 5 deletions

diff --git a/all_pairs/Makefile b/all_pairs/Makefile
index 0042372..5eef323 100644
--- a/all_pairs/Makefile
+++ b/all_pairs/Makefile
@@ -1,7 +1,7 @@
-LIBLITMUS ?= /media/speedy/litmus/liblitmus
+LIBLITMUS ?= /home/litmus/liblitmus
 CC ?= gcc
-CFLAGS = -pthread -O2 -I.. -DPAIRED
-LDFLAGS = -lrt
+override CFLAGS += -pthread -O2 -I.. -DPAIRED
+LDFLAGS += -lrt
 COMMON = ../extra.h
 
 # Handle cases where we're also profiling with the MMDC on the i.MX6Q
@@ -11,8 +11,8 @@ endif
 
 # Include all the LITMUS^RT headers if we're using it
 ifneq ($(shell grep "define LITMUS 1" ../extra.h),)
-        CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
-        LDFLAGS += -L${LIBLITMUS} -llitmus
+        override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
+        override LDFLAGS += -L${LIBLITMUS} -llitmus
 endif
 
 all: bin/cjpeg_wrbmp bin/huff_enc bin/gsm_enc bin/dijkstra bin/h264_dec bin/susan bin/adpcm_enc bin/rijndael_dec bin/huff_dec bin/rijndael_enc bin/gsm_dec bin/anagram bin/epic bin/ammunition bin/g723_enc bin/ndes bin/petrinet bin/statemate bin/cjpeg_transupp bin/mpeg2 bin/fmref bin/audiobeam bin/adpcm_dec