Procházet zdrojové kódy

BProcess: move to process/

ambrop7 před 15 roky
rodič
revize
5219871b0b

+ 1 - 0
CMakeLists.txt

@@ -91,6 +91,7 @@ add_subdirectory(dhcpclient)
 add_subdirectory(ncdconfig)
 if (NOT WIN32)
     add_subdirectory(ipc)
+    add_subdirectory(process)
 endif ()
 
 # example programs

+ 1 - 1
examples/CMakeLists.txt

@@ -38,5 +38,5 @@ if (NOT WIN32)
     target_link_libraries(dhcpclient_test dhcpclient)
 
     add_executable(bprocess_example bprocess_example.c)
-    target_link_libraries(bprocess_example system)
+    target_link_libraries(bprocess_example system process)
 endif ()

+ 1 - 1
examples/bprocess_example.c

@@ -29,7 +29,7 @@
 #include <system/BReactor.h>
 #include <system/BSignal.h>
 #include <system/BTime.h>
-#include <system/BProcess.h>
+#include <process/BProcess.h>
 
 BReactor reactor;
 BProcessManager manager;

+ 1 - 1
ncd/CMakeLists.txt

@@ -17,7 +17,7 @@ add_executable(badvpn-ncd
     modules/net_ipv4_route.c
     modules/net_ipv4_dhcp.c
 )
-target_link_libraries(badvpn-ncd system dhcpclient ncdconfig)
+target_link_libraries(badvpn-ncd system dhcpclient ncdconfig process)
 
 install(
     TARGETS badvpn-ncd

+ 1 - 1
ncd/NCDModule.h

@@ -27,9 +27,9 @@
 
 #include <misc/debugerror.h>
 #include <system/BReactor.h>
-#include <system/BProcess.h>
 #include <system/BPending.h>
 #include <system/BLog.h>
+#include <process/BProcess.h>
 #include <ncdconfig/NCDConfig.h>
 #include <ncd/NCDValue.h>
 

+ 0 - 1
ncd/modules/net_backend_badvpn.c

@@ -30,7 +30,6 @@
 #include <string.h>
 
 #include <misc/cmdline.h>
-#include <system/BProcess.h>
 #include <ncd/NCDModule.h>
 #include <ncd/NCDIfConfig.h>
 

+ 1 - 1
ncd/ncd.c

@@ -35,9 +35,9 @@
 #include <structure/LinkedList2.h>
 #include <system/BLog.h>
 #include <system/BReactor.h>
-#include <system/BProcess.h>
 #include <system/BSignal.h>
 #include <system/BSocket.h>
+#include <process/BProcess.h>
 #include <ncdconfig/NCDConfigParser.h>
 #include <ncd/NCDModule.h>
 #include <ncd/modules/modules.h>

+ 1 - 1
system/BProcess.c → process/BProcess.c

@@ -34,7 +34,7 @@
 #include <misc/offset.h>
 #include <system/BLog.h>
 
-#include <system/BProcess.h>
+#include <process/BProcess.h>
 
 #include <generated/blog_channel_BProcess.h>
 

+ 2 - 2
system/BProcess.h → process/BProcess.h

@@ -20,8 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef BADVPN_SYSTEM_BPROCESS_H
-#define BADVPN_SYSTEM_BPROCESS_H
+#ifndef BADVPN_PROCESS_BPROCESS_H
+#define BADVPN_PROCESS_BPROCESS_H
 
 #include <stdint.h>
 #include <unistd.h>

+ 2 - 0
process/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(process BProcess.c)
+target_link_libraries(process system)

+ 0 - 1
system/CMakeLists.txt

@@ -8,7 +8,6 @@ if (NOT WIN32)
     list(APPEND BSYSTEM_ADDITIONAL_SOURCES
         BLog_syslog.c
         BUnixSignal.c
-        BProcess.c
     )
 endif ()