summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-24 19:39:53 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-28 13:10:28 +0200
commit87354c9a6de95d5dcebace77a35fc21a73d599ab (patch)
treea6d36044d59b15893680282a274d964136d27fe5 /source3
parentb7b798e15b7be2d57e20c14cca2f908b301ed894 (diff)
downloadsamba-87354c9a6de95d5dcebace77a35fc21a73d599ab.tar.gz
samba-87354c9a6de95d5dcebace77a35fc21a73d599ab.tar.bz2
samba-87354c9a6de95d5dcebace77a35fc21a73d599ab.zip
lib/util Split samba-modules library into public and private parts
This will allow OpenChange to get at the symbols it needs, without exposing any more of this as a public API than we must. Andrew Bartlett
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/include/includes.h2
-rwxr-xr-xsource3/wscript_build2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d19409098f..a3725735eb 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -468,7 +468,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
../lib/util/charset/charset_macosxfs.o intl/lang_tdb.o \
lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
lib/sessionid_tdb.o \
- ../lib/util/modules.o lib/events.o @LIBTEVENT_OBJ0@ \
+ ../lib/util/internal_module.o ../lib/util/samba_module.o lib/events.o @LIBTEVENT_OBJ0@ \
@CCAN_OBJ@ \
lib/server_contexts.o \
lib/server_prefork.o \
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 562b64ca9a..94ff3181e6 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -524,7 +524,7 @@ typedef char fstring[FSTRING_LEN];
#include "smb.h"
#include "../lib/util/byteorder.h"
-#include "../lib/util/samba_modules.h"
+#include "../lib/util/internal_module.h"
#include "../lib/util/talloc_stack.h"
#include "../lib/util/smb_threads.h"
#include "../lib/util/smb_threads_internal.h"
diff --git a/source3/wscript_build b/source3/wscript_build
index d8f6893d46..095cd078d6 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -799,7 +799,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
- deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules',
+ deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-module samba-internal-module',
vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim',