26 files changed, 31 insertions, 458 deletions

diff --git a/baseline/Makefile b/baseline/Makefile
index ef39b7d..40b57f4 100644
--- a/baseline/Makefile
+++ b/baseline/Makefile
@@ -1,25 +1,28 @@
 LIBLITMUS ?= /media/speedy/litmus/liblitmus
 CC ?= gcc
-CFLAGS = -pthread -O2
+CFLAGS = -pthread -O2 -I..
 LDFLAGS = -lrt
-COMMON = ./source/extra.h
+COMMON = ../extra.h
 
 # Handle cases where we're also profiling with the MMDC on the i.MX6Q
-ifneq ($(shell grep "define MMDC 1" source/extra.h),)
+ifneq ($(shell grep "define MMDC 1" ../extra.h),)
         COMMON += /media/speedy/litmus/tools/mmdc/mmdc.c
 endif
 
 # Include all the LITMUS^RT headers if we're using it
-ifneq ($(shell grep "define LITMUS 1" source/extra.h),)
+ifneq ($(shell grep "define LITMUS 1" ../extra.h),)
         CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
         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
 
+debug: all
+debug: CFLAGS += -ggdb3
+
 .PHONY: clean
 clean:
-        rm 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
+        rm -f 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
 
 bin/cjpeg_wrbmp: ${COMMON} ./source/cjpeg_wrbmp/cjpeg_wrbmp.c ./source/cjpeg_wrbmp/input.c
         $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c
index 04a5746..368e98d 100644
--- a/baseline/source/adpcm_dec/adpcm_dec.c
+++ b/baseline/source/adpcm_dec/adpcm_dec.c
@@ -35,7 +35,7 @@
   Forward declaration of functions
 */
 
-#include "../extra.h"
+#include "extra.h"
 
 void adpcm_dec_decode( int );
 int adpcm_dec_filtez( int *bpl, int *dlt );
diff --git a/baseline/source/adpcm_enc/adpcm_enc.c b/baseline/source/adpcm_enc/adpcm_enc.c
index 464768f..777aaf5 100644
--- a/baseline/source/adpcm_enc/adpcm_enc.c
+++ b/baseline/source/adpcm_enc/adpcm_enc.c
@@ -29,7 +29,7 @@
 
 /* common sampling rate for sound cards on IBM/PC */
 
-#include "../extra.h"
+#include "extra.h"
 #define SAMPLE_RATE 11025
 
 #define PI 3141
diff --git a/baseline/source/ammunition/ammunition.c b/baseline/source/ammunition/ammunition.c
index 269f4c0..052520e 100644
--- a/baseline/source/ammunition/ammunition.c
+++ b/baseline/source/ammunition/ammunition.c
@@ -24,7 +24,7 @@
 
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "bits.h"
 #include "arithm.h"
 #include "ammunition_stdlib.h"
diff --git a/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c
index b458fd2..5c1f29a 100644
--- a/baseline/source/anagram/anagram.c
+++ b/baseline/source/anagram/anagram.c
@@ -157,7 +157,7 @@
    steps to FindAnagram.
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "anagram_ctype.h"
 #include "anagram_stdlib.h"
 #include "anagram_strings.h"
diff --git a/baseline/source/audiobeam/audiobeam.c b/baseline/source/audiobeam/audiobeam.c
index 208de80..50ebfff 100644
--- a/baseline/source/audiobeam/audiobeam.c
+++ b/baseline/source/audiobeam/audiobeam.c
@@ -23,7 +23,7 @@
   Include section
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "audiobeamlibm.h"
 #include "audiobeamlibmalloc.h"
 #include "audiobeam.h"
diff --git a/baseline/source/cjpeg_transupp/cjpeg_transupp.c b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
index 3f48539..5ec7e5e 100644
--- a/baseline/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
@@ -29,7 +29,7 @@
   Include section
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "jpeglib.h"
 
 
diff --git a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 278725c..3c8d7ec 100644
--- a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -24,7 +24,7 @@
 
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "cdjpeg.h"
 
 #ifdef CJPEG_WRBMP_BMP_SUPPORTED
diff --git a/baseline/source/dijkstra/dijkstra.c b/baseline/source/dijkstra/dijkstra.c
index 1b6a52f..333fd43 100644
--- a/baseline/source/dijkstra/dijkstra.c
+++ b/baseline/source/dijkstra/dijkstra.c
@@ -17,7 +17,7 @@
 
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "input.h"
 
 /*
diff --git a/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index e258a4a..a1e344c 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/source/epic/epic.c
@@ -35,7 +35,7 @@
 */
 
 
-#include "../extra.h"
+#include "extra.h"
 #include "epic.h"
 
 #define X_SIZE  64
diff --git a/baseline/source/extra.h b/baseline/source/extra.h
deleted file mode 100644
index e8f3d18..0000000
--- a/baseline/source/extra.h
+++ /dev/null