Remove amalgamation

See merge request nexedi/osie!14

coupler/opc-ua-server/Makefile

@@ -5,7 +5,7 @@ EXTRA_FLAGS=$(C_COMPILER_EXTRA_FLAGS)
 OUT_DIR= $(BINARY_OUT_DIR)
 
 server: server.c
-	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -std=c99 $(OPEN62541_SOURCE_HOME)/open62541.c $(EXTRA_FLAGS)
+	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -std=c99 $(EXTRA_FLAGS)
 
 install:
 	@cp server $(OUT_DIR)

coupler/opc-ua-server/common.h

 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/for more information. */
 
-#include "open62541.h"
-
+#include <open62541/server.h>
 
 /* loadFile parses the certificate file.
  *

coupler/opc-ua-server/mod_io_opc_ua.h

@@ -2,6 +2,8 @@
  * OPC-UA code representation of MOD-IOs connected to a Lime2
  */
 
+#include <open62541/server.h>
+
 void addIntegerVariableNode(UA_Server *server, char *node_id, char *node_description)
 {
     UA_Int32 myInteger = 0;

coupler/opc-ua-server/server.c

@@ -20,14 +20,18 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <signal.h>
-#include "open62541.h"
 #include <argp.h>
 #include <string.h>
 #include "common.h"
 #include "mod_io_i2c.h"
 #include "mod_io_opc_ua.h"
 #include <time.h>
-
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
+#include <open62541/plugin/pubsub_ethernet.h>
+#include <open62541/plugin/pubsub_udp.h>
 
 // The default port of OPC-UA server
 const int DEFAULT_OPC_UA_PORT = 4840;

slapos/software/osie-coupler/software-opc-ua-virtual.cfg

@@ -12,12 +12,11 @@ environment =
   OPEN62541_HOME = ${open62541:location}
   OPEN62541_SOURCE_HOME = ${open62541-source:location}
   BINARY_OUT_DIR = ${buildout:directory}/bin
-  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib  -lmbedtls -lmbedx509 -lmbedcrypto
+  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib  -lmbedtls -lmbedx509 -lmbedcrypto -l:libopen62541.so -L${open62541:location}/lib
 # actually configure-command is useless here but needed by convention
 configure-command = 
   ${cmake:location}/bin/cmake
 
-# XXX: add own instance which is able to expose an environmental variable (I2C_VIRTUAL_MODE=1)
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance-opc-ua-virtual.cfg.in

slapos/software/osie-coupler/software-opc-ua.cfg

@@ -33,13 +33,12 @@ configure-command =
   ${git:location}/bin/git submodule update --init --recursive
   ${cmake:location}/bin/cmake
 configure-options =
-  -DBUILD_SHARED_LIBS=OFF
+  -DBUILD_SHARED_LIBS=ON
   -DCMAKE_BUILD_TYPE=RelWithDebInfo
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DUA_ENABLE_PUBSUB=ON
   -DUA_ENABLE_PUBSUB_MONITORING=ON
   -DUA_NAMESPACE_ZERO=REDUCED
-  -DUA_ENABLE_AMALGAMATION=ON
   -DUA_ENABLE_ENCRYPTION=MBEDTLS
   -DUA_ENABLE_ENCRYPTION_MBEDTLS=ON
 
@@ -58,7 +57,7 @@ environment =
   OPEN62541_HOME = ${open62541:location}
   OPEN62541_SOURCE_HOME = ${open62541-source:location}
   BINARY_OUT_DIR = ${buildout:directory}/bin
-  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib  -lmbedtls -lmbedx509 -lmbedcrypto
+  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib  -lmbedtls -lmbedx509 -lmbedcrypto -l:libopen62541.so -L${open62541:location}/lib
 # actually configure-command is useless here but needed by convention
 configure-command = 
   ${cmake:location}/bin/cmake