copying of autogenerated files is now managed by tool/Makefile.am

src/Makefile.am

@@ -1,9 +1,4 @@
 TOOL_DIR = ../tool
-opcua.c: $(TOOL_DIR)/opcua.c
-	cp $< $@
-opcua_namespace_0.c: $(TOOL_DIR)/opcua_namespace_0.c
-	cp $< $@
-
 #__top_builddir__bin_stackTest_out_SOURCES =	opcuaServer.c\
 #											opcua_builtInDatatypes.c\
 #											opcua_binaryEncDec.c\
@@ -23,8 +18,7 @@ opcua_namespace_0.c: $(TOOL_DIR)/opcua_namespace_0.c
 #					  opcua_connectionHelper.h	
 lib_LTLIBRARIES = libopen62541.la
 libopen62541_la_LDFLAGS = -avoid-version -no-undefined
-libopen62541_la_SOURCES = include/opcua.h\
-						opcua.c\
+libopen62541_la_SOURCES = 			opcua.c\
 						opcua_basictypes.c\
 						opcua_namespace_0.c\
 						opcua_transportLayer.c\

tool/Makefile.am

@@ -1,14 +1,25 @@
-all-local: opcua.c opcua.h opcua_namespace_0.c opcua_namespace_0.h
+SRC_DIR = $(top_builddir)/src
+INCLUDE_DIR = $(top_builddir)/include
+AUTO_NAME = opcua
+NS0_NAME = opcua_namespace_0
 
-opcua.c opcua.h: Opc.Ua.Types.bsd generate_builtin.py
-	python generate_builtin.py Opc.Ua.Types.bsd opcua
+all-local: $(AUTO_NAME).c $(AUTO_NAME).h $(NS0_NAME).c $(NS0_NAME).h
+
+$(AUTO_NAME).c $(AUTO_NAME).h: Opc.Ua.Types.bsd generate_builtin.py
+	python generate_builtin.py Opc.Ua.Types.bsd $(AUTO_NAME)
+	cp $(AUTO_NAME).c $(SRC_DIR)
+	cp $(AUTO_NAME).h $(INCLUDE_DIR)
 	
-opcua_namespace_0.c opcua_namespace_0.h: NodeIds.csv generate_namespace.py 
-	python generate_namespace.py NodeIds.csv opcua_namespace_0
+$(NS0_NAME).c $(NS0_NAME).h: NodeIds.csv generate_namespace.py 
+	python generate_namespace.py NodeIds.csv $(NS0_NAME)
+	cp $(NS0_NAME).c $(SRC_DIR)
+	cp $(NS0_NAME).h $(INCLUDE_DIR)
 
 PHONY: clean-autogenerated
 clean-autogenerated:
-	rm -rf opcua.c opcua.h
-	rm -rf opcua_namespace_0.c opcua_namespace_0.h
+	rm -rf $(AUTO_NAME).c $(AUTO_NAME).h
+	rm -rf $(SRC_DIR)/$(AUTO_NAME).c $(INCLUDE_DIR)/$(AUTO_NAME).h
+	rm -rf $(NS0_NAME).c $(NS0_NAME).h
+	rm -rf $(SRC_DIR)/$(NS0_NAME).c $(INCLUDE_DIR)/$(NS0_NAME).h
 
-clean-local: clean-autogenerated
+clean-local: clean-autogenerated