From 2a98f95df80539ae9b4313ba8a93869ad17168ae Mon Sep 17 00:00:00 2001
From: Alexander Sergeev <sanekas@yandex-team.ru>
Date: Sun, 18 Nov 2018 20:43:44 +0300
Subject: [PATCH] Fix makefile, add CLion dirs to .gitignore

---
 .gitignore |  2 ++
 Makefile   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 567609b1..33de3094 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 build/
+cmake-build-debug/
+.idea/
diff --git a/Makefile b/Makefile
index 1c6ce571..88c3b578 100644
--- a/Makefile
+++ b/Makefile
@@ -89,10 +89,10 @@ LIB_API_HEADER_FILES = hal/inc/hal_time.h
 LIB_API_HEADER_FILES += hal/inc/hal_thread.h
 LIB_API_HEADER_FILES += hal/inc/hal_filesystem.h
 LIB_API_HEADER_FILES += hal/inc/tls_config.h
+LIB_API_HEADER_FILES += hal/inc/lib_memory.h
 LIB_API_HEADER_FILES += src/common/inc/libiec61850_common_api.h
 LIB_API_HEADER_FILES += src/common/inc/linked_list.h
 LIB_API_HEADER_FILES += src/common/inc/byte_buffer.h
-LIB_API_HEADER_FILES += src/common/inc/lib_memory.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_client.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_common.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_server.h
@@ -128,20 +128,20 @@ LIB_SOURCES = $(call get_sources,$(LIB_SOURCE_DIRS))
 LIB_OBJS = $(call src_to,.o,$(LIB_SOURCES))
 
 CFLAGS += -std=gnu99
-#CFLAGS += -Wno-error=format 
+#CFLAGS += -Wno-error=format
 CFLAGS += -Wstrict-prototypes
 
 ifneq ($(HAL_IMPL), WIN32)
-CFLAGS += -Wuninitialized 
+CFLAGS += -Wuninitialized
 endif
 
-CFLAGS += -Wsign-compare 
-CFLAGS += -Wpointer-arith 
-CFLAGS += -Wnested-externs 
-CFLAGS += -Wmissing-declarations 
+CFLAGS += -Wsign-compare
+CFLAGS += -Wpointer-arith
+CFLAGS += -Wnested-externs
+CFLAGS += -Wmissing-declarations
 CFLAGS += -Wshadow
 CFLAGS += -Wall
-#CFLAGS += -Werror  
+#CFLAGS += -Werror
 
 all:	lib