summaryrefslogtreecommitdiff
path: root/ucoo/arch
diff options
context:
space:
mode:
authorNicolas Schodet2015-05-15 12:05:06 +0200
committerNicolas Schodet2019-10-07 00:44:50 +0200
commit41fde87ed8d1fcd593777bdfae2fa9e65006d984 (patch)
tree48a82b5ba790741d1f0bcc97eb183ea4b045d7b0 /ucoo/arch
parent751a7d2ba7a0fbb9c6dae2d91891f0cc74897a2a (diff)
build: add support for out of tree modules
Diffstat (limited to 'ucoo/arch')
-rw-r--r--ucoo/arch/Module3
-rw-r--r--ucoo/arch/host/Module2
-rw-r--r--ucoo/arch/host/mex/Config2
-rw-r--r--ucoo/arch/host/mex/Module4
-rw-r--r--ucoo/arch/host/mex/mex_socket.host.cc4
5 files changed, 8 insertions, 7 deletions
diff --git a/ucoo/arch/Module b/ucoo/arch/Module
index 8ed9210..9a4989e 100644
--- a/ucoo/arch/Module
+++ b/ucoo/arch/Module
@@ -1,2 +1,3 @@
-arch_SOURCES := arch.host.cc arch.stm32.cc arch.stm32f1.cc arch.stm32f4.cc \
+ucoo_arch_SOURCES := arch.host.cc \
+ arch.stm32.cc arch.stm32f1.cc arch.stm32f4.cc \
syscalls.newlib.cc syscalls.cc
diff --git a/ucoo/arch/host/Module b/ucoo/arch/host/Module
index 2c7fead..f96adbf 100644
--- a/ucoo/arch/host/Module
+++ b/ucoo/arch/host/Module
@@ -1,2 +1,2 @@
-arch_host_SOURCES := host.host.cc host_stream.host.cc
+ucoo_arch_host_SOURCES := host.host.cc host_stream.host.cc
host_LIBS += -lutil
diff --git a/ucoo/arch/host/mex/Config b/ucoo/arch/host/mex/Config
index de679f0..87076f6 100644
--- a/ucoo/arch/host/mex/Config
+++ b/ucoo/arch/host/mex/Config
@@ -1,2 +1,2 @@
-[arch/host/mex]
+[ucoo/arch/host/mex]
default_address = "localhost", "2442"
diff --git a/ucoo/arch/host/mex/Module b/ucoo/arch/host/mex/Module
index 941482b..01835ed 100644
--- a/ucoo/arch/host/mex/Module
+++ b/ucoo/arch/host/mex/Module
@@ -1,2 +1,2 @@
-arch_host_mex_SOURCES := mex_msg.host.cc mex_node.host.cc mex_socket.host.cc \
- socket.host.c
+ucoo_arch_host_mex_SOURCES := mex_msg.host.cc mex_node.host.cc \
+ mex_socket.host.cc socket.host.c
diff --git a/ucoo/arch/host/mex/mex_socket.host.cc b/ucoo/arch/host/mex/mex_socket.host.cc
index 41a6e01..20fc491 100644
--- a/ucoo/arch/host/mex/mex_socket.host.cc
+++ b/ucoo/arch/host/mex/mex_socket.host.cc
@@ -25,7 +25,7 @@
#include "ucoo/common.hh"
-#include "config/arch/host/mex.hh"
+#include "config/ucoo/arch/host/mex.hh"
#include "socket.h"
#include <unistd.h>
@@ -43,7 +43,7 @@ Socket::~Socket ()
void
Socket::connect ()
{
- fd_ = socket_client UCOO_CONFIG_ARCH_HOST_MEX_DEFAULT_ADDRESS;
+ fd_ = socket_client CONFIG_UCOO_ARCH_HOST_MEX_DEFAULT_ADDRESS;
}
int