summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-03-30 22:09:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:21 -0500
commit44d7f4f23829d98b95d9153970849a9681e4ef26 (patch)
treee1ad9250bc9a09399d84dad152da7b0c2c2702c2 /source4
parent2d0349614c516ce63022c50ccb71bb76d04abb1c (diff)
downloadsamba-44d7f4f23829d98b95d9153970849a9681e4ef26.tar.gz
samba-44d7f4f23829d98b95d9153970849a9681e4ef26.tar.bz2
samba-44d7f4f23829d98b95d9153970849a9681e4ef26.zip
r6139: Move socket_wrapper to a seperate directory
(This used to be commit a2ef9225f15e369af7b884262b997ab321fd24d6)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/main.pm1
-rw-r--r--source4/include/system/network.h2
-rw-r--r--source4/lib/basic.mk8
-rw-r--r--source4/lib/socket_wrapper/config.mk7
-rw-r--r--source4/lib/socket_wrapper/socket_wrapper.c (renamed from source4/lib/socket_wrapper.c)0
-rw-r--r--source4/lib/socket_wrapper/socket_wrapper.h (renamed from source4/lib/socket_wrapper.h)0
6 files changed, 9 insertions, 9 deletions
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 1dee5be910..e42e15b1f8 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -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",
diff --git a/source4/include/system/network.h b/source4/include/system/network.h
index f661194831..832000a5df 100644
--- a/source4/include/system/network.h
+++ b/source4/include/system/network.h
@@ -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
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index ec61a28d15..f0b2b05b6a 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -41,14 +41,6 @@ INIT_OBJ_FILES = \
################################################
##############################
-# 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]
INIT_OBJ_FILES = lib/version.o
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
new file mode 100644
index 0000000000..bc9a0951dc
--- /dev/null
+++ b/source4/lib/socket_wrapper/config.mk
@@ -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
+##############################
diff --git a/source4/lib/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c
index 5decde2cea..5decde2cea 100644
--- a/source4/lib/socket_wrapper.c
+++ b/source4/lib/socket_wrapper/socket_wrapper.c
diff --git a/source4/lib/socket_wrapper.h b/source4/lib/socket_wrapper/socket_wrapper.h
index 6da5a2980c..6da5a2980c 100644
--- a/source4/lib/socket_wrapper.h
+++ b/source4/lib/socket_wrapper/socket_wrapper.h