Merge remote-tracking branch 'upstream/master'

Makefile.am

@@ -20,7 +20,7 @@ endif
 export GLOBAL_AM_CFLAGS = $(AM_CFLAGS)
 export GLOBAL_AM_LDADD = $(AM_LDADD)
 
-SUBS=tool include src
+SUBS=tools include src
 if HAVE_CHECK
 	SUBS+= tests
 endif

configure.ac

@@ -4,7 +4,7 @@ AC_PREREQ(2.59)
 AC_INIT(Open62541, 1.0)
 
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE()
+AM_INIT_AUTOMAKE([subdir-objects])
 AC_PROG_MAKE_SET
 #default CFLAGS is -g -02
 #reset it just to -g and make optimization dependend on --enable-debug
@@ -16,6 +16,7 @@ AC_PROG_CC
 AC_PROG_LN_S
 AM_PROG_CC_C_O
 AC_CHECK_LIB([m],[exp],,AC_MSG_ERROR([Libm missing]))
+AC_CHECK_LIB([expat],[XML_Parse],,AC_MSG_ERROR([Libexpat missing]))
 PKG_CHECK_MODULES([CHECK], [check >= 0.9.12],[have_check="yes"],AC_MSG_WARN([Check not found or check version lower than 0.9.12; cannot run unit tests!])
 [have_check="no"])
 AM_CONDITIONAL([HAVE_CHECK], [test x"$have_check" = "xyes"])
@@ -95,6 +96,6 @@ AM_COND_IF([ENABLE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_FILES(Makefile include/Makefile src/Makefile tool/Makefile tests/Makefile examples/src/Makefile doc/Makefile)
+AC_CONFIG_FILES(Makefile include/Makefile src/Makefile tools/Makefile tests/Makefile examples/src/Makefile doc/Makefile)
 AC_OUTPUT
 

include/Makefile.am

@@ -1,4 +1,4 @@
-TOOL_DIR = ../tool
+TOOL_DIR = ../tools
 
 all-local: opcua.h ua_namespace_0.h
 

src/Makefile.am

@@ -2,7 +2,7 @@
 AM_CFLAGS = $(GLOBAL_AM_CFLAGS) -I$(top_builddir)/include -I$(top_builddir)/src -I. -I$(top_builddir)/src/util
 
 
-TOOL_DIR = ../tool
+TOOL_DIR = ../tools
 #__top_builddir__bin_stackTest_out_SOURCES =	opcuaServer.c\
 #											opcua_builtInDatatypes.c\
 #											opcua_binaryEncDec.c\

tools/indent.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+if [ $# -eq 0 ]; then
+echo "usage: $0 <file1 file2 ...>"
+   exit 1
+fi
+if [ "$(type -t indent)" = "" ]; then
+echo "Please install GNU indent first."
+   exit 1
+fi
+
+# Assume a width of 4 spaces per tab.
+# E.g. when indenting to the opening braces of an argument list.
+
+indent \
+--line-length120 \
+--comment-line-length100 \
+--indent-level4 \
+--use-tabs \
+--tab-size4 \
+--case-indentation0 \
+--declaration-indentation1 \
+--ignore-newlines \
+--swallow-optional-blank-lines \
+--blank-lines-after-procedures \
+--no-blank-lines-after-commas \
+--break-after-boolean-operator \
+--no-space-after-for \
+--no-space-after-if \
+--no-space-after-while \
+--no-space-after-casts \
+--braces-on-if-line \
+--braces-on-func-def-line \
+--braces-on-struct-decl-line \
+--cuddle-do-while \
+--cuddle-else \
+--dont-break-procedure-type \
+--continue-at-parentheses \
+--no-space-after-function-call-names \
+--no-space-after-parentheses \
+--no-comment-delimiters-on-blank-lines \
+--comment-indentation0 \
+--format-first-column-comments \
+--declaration-comment-column0 \
+--format-all-comments \
+--line-comments-indentation0 \
+--blank-lines-before-block-comments \
+--space-special-semicolon \
+$@
+
+
+# Remove trailing whitespace
+for file in $@; do
+	sed -i -e's/[[:space:]]*$//' "$file"
+done