Change liblitmus to have a more sane repository layout.

15 files changed, 23 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 765ebde..10f57dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,43 @@
-CFLAGS=-Wall -g
+CFLAGS=-Wall -g -Iinclude/
 CPPFLAGS=-Wall -g
 
+LIBS= ./liblitmus.a
+
 TARGETS = showsched iotest set_rt_mode  run timeout rt_launch edfhsb liblitmus.a wait_test np_test
 
+vpath %.h include/
+vpath %.c src/
 
 all: ${TARGETS}
 clean:
-        rm *.o ${TARGETS}
+        rm -f *.o *~  ${TARGETS}
 
-wait_test: wait_test.o litmus.h litmus.o
-        cc -static -o wait_test litmus.o wait_test.o
+wait_test: wait_test.o litmus.h liblitmus.a
+        cc -static -o wait_test wait_test.o  ${LIBS}
 
-np_test: np_test.o litmus.h litmus.o
-        cc -static -o np_test litmus.o np_test.o
+np_test: np_test.o litmus.h liblitmus.a
+        cc -static -o np_test np_test.o  ${LIBS}
 
-iotest: iotest.o litmus.h litmus.o
-        cc -static -o iotest litmus.o iotest.o
+iotest: iotest.o litmus.h liblitmus.a
+        cc -static -o iotest iotest.o  ${LIBS}
 
 run: run.o
         cc -o run run.o
 
-set_rt_mode: litmus.o set_rt_mode.o
-        cc -o set_rt_mode litmus.o set_rt_mode.o
+set_rt_mode: liblitmus.a set_rt_mode.o
+        cc -o set_rt_mode set_rt_mode.o  ${LIBS}
 
-showsched: show_scheduler.o litmus.o litmus.h
-        cc -o showsched show_scheduler.o litmus.o
+showsched: show_scheduler.o liblitmus.a litmus.h
+        cc -o showsched  show_scheduler.o  ${LIBS}
 
-timeout: litmus.o timeout.o litmus.h
-        cc -static -o timeout litmus.o timeout.o
+timeout: liblitmus.a timeout.o litmus.h
+        cc -static -o timeout timeout.o  ${LIBS}
 
-rt_launch: litmus.o litmus.h rt_launch.o
-        cc -static -o rt_launch litmus.o rt_launch.o
+rt_launch: liblitmus.a litmus.h rt_launch.o
+        cc -static -o rt_launch  rt_launch.o ${LIBS}
 
-edfhsb: litmus.o edf-hsb.o litmus.h edf-hsb.h hrt.o
-        cc -o edfhsb hrt.o litmus.o edf-hsb.o
+edfhsb: liblitmus.a edf-hsb.o litmus.h edf-hsb.h hrt.o
+        cc -o edfhsb hrt.o edf-hsb.o  ${LIBS}
 
 liblitmus.a: litmus.o litmus.h edf-hsb.o edf-hsb.h
-        ${AR} rcs liblitmus.a litmus.o edf-hsb.o
+        ${AR} rcs liblitmus.a litmus.o edf-hsb.o 
diff --git a/edf-hsb.h b/include/edf-hsb.h
index 0ac3d4f..0ac3d4f 100644
--- a/edf-hsb.h
+++ b/include/edf-hsb.h
diff --git a/litmus.h b/include/litmus.h
index 88b0f0b..88b0f0b 100644
--- a/litmus.h
+++ b/include/litmus.h
diff --git a/logformat.h b/include/logformat.h
index 3a74bf7..3a74bf7 100644
--- a/logformat.h
+++ b/include/logformat.h
diff --git a/edf-hsb.c b/src/edf-hsb.c
index 9ace2ca..9ace2ca 100644
--- a/edf-hsb.c
+++ b/src/edf-hsb.c
diff --git a/hrt.c b/src/hrt.c
index 224293c..224293c 100644
--- a/hrt.c
+++ b/src/hrt.c
diff --git a/iotest.c b/src/iotest.c
index ac07e74..ac07e74 100644
--- a/iotest.c
+++ b/src/iotest.c
diff --git a/litmus.c b/src/litmus.c
index 65ad294..65ad294 100644
--- a/litmus.c
+++ b/src/litmus.c
diff --git a/np_test.c b/src/np_test.c
index dad68aa..dad68aa 100644
--- a/np_test.c
+++ b/src/np_test.c
diff --git a/rt_launch.c b/src/rt_launch.c
index 31e6447..31e6447 100644
--- a/rt_launch.c
+++ b/src/rt_launch.c
diff --git a/run.c b/src/run.c
index 3719d6f..3719d6f 100644
--- a/run.c
+++ b/src/run.c
diff --git a/set_rt_mode.c b/src/set_rt_mode.c
index 5936d7d..5936d7d 100644
--- a/set_rt_mode.c
+++ b/src/set_rt_mode.c
diff --git a/show_scheduler.c b/src/show_scheduler.c
index 7026e2a..7026e2a 100644
--- a/show_scheduler.c
+++ b/src/show_scheduler.c
diff --git a/timeout.c b/src/timeout.c
index ba513f9..ba513f9 100644
--- a/timeout.c
+++ b/src/timeout.c
diff --git a/wait_test.c b/src/wait_test.c
index efd4d90..efd4d90 100644
--- a/wait_test.c
+++ b/src/wait_test.c