From 6862128151fb78f63685a8da5575783c426d64a7 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Wed, 5 Apr 2006 12:10:50 +0000
Subject: ../svn-commit.tmp

---
 Source/charon/threads/Makefile.threads   | 14 +++++++-------
 Source/charon/threads/kernel_interface.h |  2 +-
 Source/charon/threads/stroke_interface.c |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Source/charon/threads')

diff --git a/Source/charon/threads/Makefile.threads b/Source/charon/threads/Makefile.threads
index 043f547bc..949c1ad24 100644
--- a/Source/charon/threads/Makefile.threads
+++ b/Source/charon/threads/Makefile.threads
@@ -12,28 +12,28 @@
 # for more details.
 #
 
-THREADS_DIR= $(MAIN_DIR)threads/
+THREADS_DIR= $(CHARON_DIR)threads/
 
-OBJS+= $(BUILD_DIR)receiver.o
+CHARON_OBJS+= $(BUILD_DIR)receiver.o
 $(BUILD_DIR)receiver.o :		$(THREADS_DIR)receiver.c $(THREADS_DIR)receiver.h
 								$(CC) $(CFLAGS) -c -o $@ $<
 								
-OBJS+= $(BUILD_DIR)scheduler.o
+CHARON_OBJS+= $(BUILD_DIR)scheduler.o
 $(BUILD_DIR)scheduler.o :		$(THREADS_DIR)scheduler.c $(THREADS_DIR)scheduler.h
 								$(CC) $(CFLAGS) -c -o $@ $<
 								
-OBJS+= $(BUILD_DIR)sender.o
+CHARON_OBJS+= $(BUILD_DIR)sender.o
 $(BUILD_DIR)sender.o :			$(THREADS_DIR)sender.c $(THREADS_DIR)sender.h
 								$(CC) $(CFLAGS) -c -o $@ $<
 								
-OBJS+= $(BUILD_DIR)thread_pool.o
+CHARON_OBJS+= $(BUILD_DIR)thread_pool.o
 $(BUILD_DIR)thread_pool.o :		$(THREADS_DIR)thread_pool.c $(THREADS_DIR)thread_pool.h
 								$(CC) $(CFLAGS) -c -o $@ $<
 								
-OBJS+= $(BUILD_DIR)kernel_interface.o
+CHARON_OBJS+= $(BUILD_DIR)kernel_interface.o
 $(BUILD_DIR)kernel_interface.o :$(THREADS_DIR)kernel_interface.c $(THREADS_DIR)kernel_interface.h
 								$(CC) $(CFLAGS) -c -o $@ $<
 								
-OBJS+= $(BUILD_DIR)stroke_interface.o
+CHARON_OBJS+= $(BUILD_DIR)stroke_interface.o
 $(BUILD_DIR)stroke_interface.o :$(THREADS_DIR)stroke_interface.c $(THREADS_DIR)stroke_interface.h
 								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/Source/charon/threads/kernel_interface.h b/Source/charon/threads/kernel_interface.h
index f7621afd9..ceafa6468 100644
--- a/Source/charon/threads/kernel_interface.h
+++ b/Source/charon/threads/kernel_interface.h
@@ -25,7 +25,7 @@
 
 #include <linux/xfrm.h>
 
-#include <network/host.h>
+#include <utils/host.h>
 #include <encoding/payloads/proposal_substructure.h>
 
 typedef struct kernel_interface_t kernel_interface_t;
diff --git a/Source/charon/threads/stroke_interface.c b/Source/charon/threads/stroke_interface.c
index 5ef2737ff..4468a37cf 100755
--- a/Source/charon/threads/stroke_interface.c
+++ b/Source/charon/threads/stroke_interface.c
@@ -36,7 +36,7 @@
 #include <stroke.h>
 #include <types.h>
 #include <daemon.h>
-#include <transforms/certificate.h>
+#include <crypto/certificate.h>
 #include <utils/allocator.h>
 #include <queues/jobs/initiate_ike_sa_job.h>
 
-- 
cgit v1.2.3