- fixed install target of makefile and added missing header file for …

…cmake
mz-automation · Oct 12, 2018 · 3375bca · 3375bca
1 parent db821a0
commit 3375bca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib60870-C/CMakeLists.txt b/lib60870-C/CMakeLists.txt
@@ -62,6 +62,7 @@ set(API_HEADERS
 	${CMAKE_CURRENT_LIST_DIR}/src/hal/inc/hal_time.h 
 	${CMAKE_CURRENT_LIST_DIR}/src/hal/inc/hal_thread.h
 	${CMAKE_CURRENT_LIST_DIR}/src/hal/inc/hal_socket.h
+	${CMAKE_CURRENT_LIST_DIR}/src/hal/inc/hal_serial.h
 	${CMAKE_CURRENT_LIST_DIR}/src/inc/api/cs101_master.h
 	${CMAKE_CURRENT_LIST_DIR}/src/inc/api/cs101_slave.h
 	${CMAKE_CURRENT_LIST_DIR}/src/inc/api/cs104_slave.h

diff --git a/lib60870-C/Makefile b/lib60870-C/Makefile
@@ -50,11 +50,16 @@ endif
 LIB_API_HEADER_FILES = src/hal/inc/hal_time.h 
 LIB_API_HEADER_FILES += src/hal/inc/hal_thread.h
 LIB_API_HEADER_FILES += src/hal/inc/hal_socket.h
-LIB_API_HEADER_FILES += src/inc/api/iec60870_master.h
-LIB_API_HEADER_FILES += src/inc/api/iec60870_server.h
+LIB_API_HEADER_FILES += src/hal/inc/hal_serial.h
+LIB_API_HEADER_FILES += src/inc/api/cs101_information_objects.h
+LIB_API_HEADER_FILES += src/inc/api/cs101_master.h
+LIB_API_HEADER_FILES += src/inc/api/cs101_slave.h
+LIB_API_HEADER_FILES += src/inc/api/cs104_connection.h
+LIB_API_HEADER_FILES += src/inc/api/cs104_slave.h
 LIB_API_HEADER_FILES += src/inc/api/iec60870_common.h
-LIB_API_HEADER_FILES += src/inc/api/information_objects.h
-LIB_API_HEADER_FILES += src/inc/api/t104_connection.h
+LIB_API_HEADER_FILES += src/inc/api/iec60870_master.h
+LIB_API_HEADER_FILES += src/inc/api/iec60870_slave.h
+LIB_API_HEADER_FILES += src/inc/api/link_layer_parameters.h
 LIB_API_HEADER_FILES += src/tls/tls_api.h
 
 LIB_TEST_SOURCES = tests/all_tests.c