From d4977183ceadd67f4cab740e6bd38e26ad80fe93 Mon Sep 17 00:00:00 2001
From: Razvan Deaconescu <razvan.deaconescu@cs.pub.ro>
Date: Sat, 4 Jun 2011 12:36:47 +0300
Subject: [PATCH] Proper header inclusion.

Replace #include "include/xxx.h" with #include "xxx.h" and update
Makefile accordingly.
---
 src/raw/Makefile                | 2 +-
 src/raw/swift_list.c            | 5 +++--
 src/raw/swift_raw.c             | 8 +++++---
 src/raw/swift_raw_simple_test.c | 7 ++++---
 src/raw/test/Makefile           | 6 ++++++
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/raw/Makefile b/src/raw/Makefile
index a183280..ebe30f3 100644
--- 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 786c6fc..c2b5abe 100644
--- 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 a8f55ad..b7eb04a 100644
--- 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 97b24ef..a3dae44 100644
--- 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 fba469b..0ea2f98 100644
--- 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
-- 
2.20.1