13 files changed, 21 insertions, 13 deletions
diff --git a/ecp/src/ecp/Makefile b/ecp/src/ecp/Makefile
index 4590dd3..2bdd563 100644
--- a/ecp/src/ecp/Makefile
+++ b/ecp/src/ecp/Makefile
@@ -1,6 +1,6 @@
 include common.mk
 
-obj = core.o timer.o dir.o dir_srv.o
+obj = core.o timer.o
 subdirs = crypto $(platform_dir)
 build_dir = ../../build-$(platform)
 
@@ -31,6 +31,12 @@ install: all
 	if [ -f vconn/libecpvconn.a ]; then \
 		install vconn/libecpvconn.a $(build_dir); \
 	fi
+	if [ -f dir/libecpext.a ]; then \
+		install vconn/libecpext.a $(build_dir); \
+	fi
+	if [ -f dir/libecpdir.a ]; then \
+		install vconn/libecpdir.a $(build_dir); \
+	fi
 
 clean:
 	for i in $(subdirs); do \
diff --git a/ecp/src/ecp/core.c b/ecp/src/ecp/core.c
index d59ea8f..badb09e 100644
--- a/ecp/src/ecp/core.c
+++ b/ecp/src/ecp/core.c
@@ -13,7 +13,7 @@
 #endif
 
 #ifdef ECP_WITH_DIR
-#include "dir.h"
+#include "dir/dir.h"
 #endif
 
 #include "cr.h"
diff --git a/ecp/src/ecp/dir.c b/ecp/src/ecp/dir/dir.c
index 0e07486..7c4b0d6 100644
--- a/ecp/src/ecp/dir.c
+++ b/ecp/src/ecp/dir/dir.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core.h"
-#include "cr.h"
+#include <core.h>
+#include <cr.h>
 
 #include "dir.h"
 #include "dir_srv.h"
diff --git a/ecp/src/ecp/dir.h b/ecp/src/ecp/dir/dir.h
index e9f8e1e..e9f8e1e 100644
--- a/ecp/src/ecp/dir.h
+++ b/ecp/src/ecp/dir/dir.h
diff --git a/ecp/src/ecp/dir_srv.c b/ecp/src/ecp/dir/dir_srv.c
index 952d393..b4d030d 100644
--- a/ecp/src/ecp/dir_srv.c
+++ b/ecp/src/ecp/dir/dir_srv.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
-#include "core.h"
-#include "cr.h"
+#include <core.h>
+#include <cr.h>
 
 #include "dir.h"
 #include "dir_srv.h"
diff --git a/ecp/src/ecp/dir_srv.h b/ecp/src/ecp/dir/dir_srv.h
index 85606c8..85606c8 100644
--- a/ecp/src/ecp/dir_srv.h
+++ b/ecp/src/ecp/dir/dir_srv.h
diff --git a/ecp/src/ecp/msgq.c b/ecp/src/ecp/ext/msgq.c
index 8a5408b..63f5aa6 100644
--- a/ecp/src/ecp/msgq.c
+++ b/ecp/src/ecp/ext/msgq.c
@@ -2,7 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core.h"
+#include <core.h>
+
 #include "rbuf.h"
 #include "msgq.h"
 
diff --git a/ecp/src/ecp/msgq.h b/ecp/src/ecp/ext/msgq.h
index dddb6e7..dddb6e7 100644
--- a/ecp/src/ecp/msgq.h
+++ b/ecp/src/ecp/ext/msgq.h
diff --git a/ecp/src/ecp/rbuf.c b/ecp/src/ecp/ext/rbuf.c
index d2e6e28..70ee0d2 100644
--- a/ecp/src/ecp/rbuf.c
+++ b/ecp/src/ecp/ext/rbuf.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 
-#include "core.h"
+#include <core.h>
+
 #include "rbuf.h"
 
 ECPRBConn *ecp_rbuf_get_rbconn(ECPConnection *conn) {
diff --git a/ecp/src/ecp/rbuf.h b/ecp/src/ecp/ext/rbuf.h
index 36ff963..36ff963 100644
--- a/ecp/src/ecp/rbuf.h
+++ b/ecp/src/ecp/ext/rbuf.h
diff --git a/ecp/src/ecp/rbuf_recv.c b/ecp/src/ecp/ext/rbuf_recv.c
index 1d50494..4c95be6 100644
--- a/ecp/src/ecp/rbuf_recv.c
+++ b/ecp/src/ecp/ext/rbuf_recv.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core.h"
-#include "tm.h"
+#include <core.h>
+#include <tm.h>
 
 #include "rbuf.h"
 
diff --git a/ecp/src/ecp/rbuf_send.c b/ecp/src/ecp/ext/rbuf_send.c
index 4a7cb2c..3dc777c 100644
--- a/ecp/src/ecp/rbuf_send.c
+++ b/ecp/src/ecp/ext/rbuf_send.c
@@ -1,7 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core.h"
+#include <core.h>
+
 #include "rbuf.h"
 
 #define NACK_RATE_UNIT      10000
diff --git a/ecp/src/platform/posix/platform_obj.mk b/ecp/src/platform/posix/platform_obj.mk
index 4157ff4..56a76c3 100644
--- a/ecp/src/platform/posix/platform_obj.mk
+++ b/ecp/src/platform/posix/platform_obj.mk
@@ -1,2 +1 @@
-obj	+= ext.o frag.o rbuf.o rbuf_send.o rbuf_recv.o msgq.o
-subdirs	+= htable vconn
+subdirs	+= htable vconn ext dir