make: moved to a simpler unity build system.

diff --git a/makefile b/makefile
index 4b66e384dcae1d1b514f938bba97d2d827684c81..82ed687f503fddeafcbca03d620f46e8fb63f36c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -7,7 +7,7 @@ LIBS=
 LDFLAGS=$(DBGLDFLAGS) $(LIBS)
 
 INSTALL_DIR=/usr/local
-OBJS:=ulas.o archs.o uldas.o 
+OBJS:=
 
 CCOBJ=$(CC) -c -o $@ $< $(CFLAGS) $(LDFLAGS)
 
@@ -21,12 +21,6 @@ main.o: src/main.c
        $(CCOBJ)
 test.o: src/test.c
        $(CCOBJ)
-ulas.o: src/ulas.c
-       $(CCOBJ)
-uldas.o: src/uldas.c
-       $(CCOBJ)
-archs.o: src/archs.c
-       $(CCOBJ)
        
 
 bin: main.o $(OBJS) 

diff --git a/src/main.c b/src/main.c
index 6e48637a8c2909cd0d640fe81eb46eef26ee60b0..9e7aadd4cd2b2e863d5a76cbf17b46c406c181c4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -6,6 +6,10 @@
 #include <unistd.h>
 #include <getopt.h>
 
+#include "ulas.c"
+#include "archs.c"
+#include "uldas.c"
+
 /**
  * TODO: Write documentation
  * FIXME: it is not possible to use #define variables in macros 

diff --git a/src/test.c b/src/test.c
index 553d5f851dc19727b6cf79a05a642efbda082c7c..db99e2417289fbbec061c836b225e09fc37e6dda 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -3,6 +3,10 @@
 #include <assert.h>
 #include <unistd.h>
 
+#include "ulas.c"
+#include "archs.c"
+#include "uldas.c"
+
 #define ULAS_TEST_OPTS "hV"
 #define ULAS_TEST_OPTS_ARG ""