BLog_syslog: move from system to base

system/BLog_syslog.c → base/BLog_syslog.c

@@ -26,7 +26,7 @@
 
 #include <misc/debug.h>
 
-#include <system/BLog_syslog.h>
+#include "BLog_syslog.h"
 
 static int resolve_facility (char *str, int *out)
 {

system/BLog_syslog.h → base/BLog_syslog.h

@@ -24,8 +24,8 @@
  * BLog syslog backend.
  */
 
-#ifndef BADVPN_SYSTEM_BLOG_SYSLOG_H
-#define BADVPN_SYSTEM_BLOG_SYSLOG_H
+#ifndef BADVPN_BLOG_SYSLOG_H
+#define BADVPN_BLOG_SYSLOG_H
 
 #include <misc/debug.h>
 #include <base/BLog.h>

base/CMakeLists.txt

@@ -1,5 +1,12 @@
+set(BASE_ADDITIONAL_SOURCES)
+
+if (NOT WIN32)
+    list(APPEND BASE_ADDITIONAL_SOURCES BLog_syslog.c)
+endif ()
+
 add_library(base
     DebugObject.c
     BLog.c
     BPending.c
+    ${BASE_ADDITIONAL_SOURCES}
 )

client/client.c

@@ -50,7 +50,7 @@
 #include <tuntap/BTap.h>
 
 #ifndef BADVPN_USE_WINAPI
-#include <system/BLog_syslog.h>
+#include <base/BLog_syslog.h>
 #endif
 
 #include <client/client.h>

flooder/flooder.c

@@ -42,7 +42,7 @@
 #include <server_connection/ServerConnection.h>
 
 #ifndef BADVPN_USE_WINAPI
-#include <system/BLog_syslog.h>
+#include <base/BLog_syslog.h>
 #endif
 
 #include <flooder/flooder.h>

ncd/ncd.c

@@ -46,7 +46,7 @@
 #include <ncd/modules/modules.h>
 
 #ifndef BADVPN_USE_WINAPI
-#include <system/BLog_syslog.h>
+#include <base/BLog_syslog.h>
 #endif
 
 #include <ncd/ncd.h>

server/server.c

@@ -55,7 +55,7 @@
 #include <nspr_support/DummyPRFileDesc.h>
 
 #ifndef BADVPN_USE_WINAPI
-#include <system/BLog_syslog.h>
+#include <base/BLog_syslog.h>
 #endif
 
 #include <server/server.h>

system/CMakeLists.txt

@@ -11,7 +11,6 @@ endif ()
 
 if (NOT WIN32)
     list(APPEND BSYSTEM_ADDITIONAL_SOURCES
-        BLog_syslog.c
         BUnixSignal.c
         BConnection_unix.c
         BDatagram_unix.c

tun2socks/tun2socks.c

@@ -52,7 +52,7 @@
 #include <tun2socks/SocksUdpGwClient.h>
 
 #ifndef BADVPN_USE_WINAPI
-#include <system/BLog_syslog.h>
+#include <base/BLog_syslog.h>
 #endif
 
 #include <tun2socks/tun2socks.h>

udpgw/udpgw.c

@@ -49,7 +49,7 @@
 #include <flow/SinglePacketBuffer.h>
 
 #ifndef BADVPN_USE_WINAPI
-#include <system/BLog_syslog.h>
+#include <base/BLog_syslog.h>
 #endif
 
 #include <udpgw/udpgw.h>