Proper header inclusion.

Replace #include "include/xxx.h" with #include "xxx.h" and update
Makefile accordingly.

diff --git a/src/raw/Makefile b/src/raw/Makefile
index a1832801a15ccb53ad9f2e172f7eb341a5f0b537..ebe30f35bd4f3adc887d763944d04ea00b4905a8 100644 (file)
--- a/src/raw/Makefile
+++ b/src/raw/Makefile
@@ -1,4 +1,4 @@
-CPPFLAGS = -DDEBUG -DLOG_LEVEL=LOG_DEBUG -I. -I.. -I../include
+CPPFLAGS = -DDEBUG -DLOG_LEVEL=LOG_DEBUG -I. -I.. -Iinclude
 #CPPFLAGS = -I. -Iinclude
 CFLAGS = -Wall -g
 

diff --git a/src/raw/swift_list.c b/src/raw/swift_list.c
index 786c6fccdfb47e4a60b78f2a9a7c6cc9280ef0be..c2b5abe91a9f77fe2ce3516db944060bd1591b76 100644 (file)
--- a/src/raw/swift_list.c
+++ b/src/raw/swift_list.c
@@ -22,9 +22,10 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "include/swift_types.h"
-#include "include/swift_list.h"
+#include "swift_types.h"
+#include "swift_list.h"
 #include "debug.h"
+#include "util.h"
 
 /*
  * Add new socket to list. Called by sw_socket "syscall".

diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c
index a8f55ad8a291c42d62cacbae89f408c1788d0bb2..b7eb04a30c761137f41c2442125bc5197ed9ed9a 100644 (file)
--- a/src/raw/swift_raw.c
+++ b/src/raw/swift_raw.c
@@ -22,9 +22,11 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "include/swift_types.h"
-#include "include/swift_raw.h"
-#include "include/swift_list.h"
+#include "swift_types.h"
+#include "swift_raw.h"
+#include "swift_list.h"
+#include "debug.h"
+#include "util.h"
 
 /*
  * Create a new socket of type TYPE in domain DOMAIN, using

diff --git a/src/raw/swift_raw_simple_test.c b/src/raw/swift_raw_simple_test.c
index 97b24efe2f80b856190ddebd52375ef6e7372393..a3dae44fb6a19f995a96ffe319c0ff4d71348244 100644 (file)
--- a/src/raw/swift_raw_simple_test.c
+++ b/src/raw/swift_raw_simple_test.c
@@ -9,9 +9,10 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "include/swift_types.h"
-#include "include/swift_raw.h"
-#include "include/util.h"
+#include "swift_types.h"
+#include "swift_raw.h"
+#include "debug.h"
+#include "util.h"
 
 /*
  * Create a socket, bind it and send data.

diff --git a/src/raw/test/Makefile b/src/raw/test/Makefile
index fba469b44ea417566b889fa55c7ce29b2d1da0a0..0ea2f98e976eeb3a1cb51dc590034a55ecd5eaf1 100644 (file)
--- a/src/raw/test/Makefile
+++ b/src/raw/test/Makefile
@@ -13,6 +13,12 @@ test: test.o test_sw_socket.o test_sw_bind.o test_sw_getsockname.o \
        test_sw_close.o test_dummy.o test_common.o \
        ../swift_raw.o ../swift_list.o
 
+../swift_raw.o: ../swift_raw.c ../include/swift_raw.h
+       make -C .. swift_raw.o
+
+../swift_list.o: ../swift_list.c ../include/swift_list.h
+       make -C .. swift_list.o
+
 clean:
        -rm -f *~ *.o
        -rm -f test