r6139: Move socket_wrapper to a seperate directory
authorJelmer Vernooij <jelmer@samba.org>
Wed, 30 Mar 2005 22:09:16 +0000 (22:09 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:11:21 +0000 (13:11 -0500)
(This used to be commit a2ef9225f15e369af7b884262b997ab321fd24d6)

source4/build/smb_build/main.pm
source4/include/system/network.h
source4/lib/basic.mk
source4/lib/socket_wrapper/config.mk [new file with mode: 0644]
source4/lib/socket_wrapper/socket_wrapper.c [moved from source4/lib/socket_wrapper.c with 100% similarity]
source4/lib/socket_wrapper/socket_wrapper.h [moved from source4/lib/socket_wrapper.h with 100% similarity]

index 1dee5be910f71eec0d25c4ea2b73fd81b8aeae8b..e42e15b1f83050a1f600e709092bc22488b6f62a 100644 (file)
@@ -39,6 +39,7 @@ sub smb_build_main($)
                "lib/events/config.mk",
                "lib/popt/config.mk",
                "lib/cmdline/config.mk",
+               "lib/socket_wrapper/config.mk",
                "smb_server/config.mk",
                "rpc_server/config.mk",
                "ldap_server/config.mk",
index f661194831d7147ccb58a76b30945ee612c98360..832000a5df01eb7b631bb6e12c225103f0397010 100644 (file)
@@ -59,7 +59,7 @@
 
 #ifdef DEVELOPER
 #define SOCKET_WRAPPER_REPLACE
-#include "lib/socket_wrapper.h"
+#include "lib/socket_wrapper/socket_wrapper.h"
 #endif
 
 #ifdef REPLACE_INET_NTOA
index ec61a28d15d7c8252be4e537223142b993b6c79f..f0b2b05b6a4db2d16066ec9987eee26dcb1d1850 100644 (file)
@@ -40,14 +40,6 @@ INIT_OBJ_FILES = \
 # End SUBSYSTEM LIBCOMPRESION
 ################################################
 
-##############################
-# Start SUBSYSTEM SOCKET_WRAPPER
-[SUBSYSTEM::SOCKET_WRAPPER]
-NOPROTO = YES
-INIT_OBJ_FILES = lib/socket_wrapper.o
-# End SUBSYSTEM SOCKET_WRAPPER
-##############################
-
 ##############################
 # Start SUBSYSTEM LIBBASIC
 [SUBSYSTEM::LIBBASIC]
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
new file mode 100644 (file)
index 0000000..bc9a095
--- /dev/null
@@ -0,0 +1,7 @@
+##############################
+# Start SUBSYSTEM SOCKET_WRAPPER
+[SUBSYSTEM::SOCKET_WRAPPER]
+NOPROTO = YES
+INIT_OBJ_FILES = lib/socket_wrapper/socket_wrapper.o
+# End SUBSYSTEM SOCKET_WRAPPER
+##############################