Fix asking for credentials for non-LDAP provisions.

[kai/samba.git] / source4 / scripting / ejs / config.mk

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e5711f1424b8013543c9735c9c2ab6badba05759..34c0a9678ed3385e4e15e05ceb761d839ada2831 100644 (file)
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,43 +1,63 @@
-#######################
-# Start LIBRARY EJSRPC
-[SUBSYSTEM::EJSRPC]
-OBJ_FILES = \
-               scripting/ejs/ejsrpc.o
-REQUIRED_SUBSYSTEMS = RPC_EJS
-NOPROTO = YES
-# End SUBSYSTEM EJSRPC
-#######################
+[MODULE::smbcalls_config]
+OUTPUT_TYPE = MERGED_OBJ
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_config
 
-#######################
-# Start LIBRARY SMBCALLS
-[SUBSYSTEM::SMBCALLS]
-OBJ_FILES = \
-               scripting/ejs/smbcalls.o \
-               scripting/ejs/smbcalls_config.o \
-               scripting/ejs/smbcalls_ldb.o \
-               scripting/ejs/smbcalls_nbt.o \
-               scripting/ejs/smbcalls_cli.o \
-               scripting/ejs/smbcalls_rpc.o \
-               scripting/ejs/smbcalls_auth.o \
-               scripting/ejs/smbcalls_options.o \
-               scripting/ejs/smbcalls_nss.o \
-               scripting/ejs/smbcalls_string.o \
-               scripting/ejs/smbcalls_data.o \
-               scripting/ejs/smbcalls_rand.o \
-               scripting/ejs/smbcalls_sys.o \
-               scripting/ejs/smbcalls_creds.o \
-               scripting/ejs/smbcalls_samba3.o \
-               scripting/ejs/mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3
-# End SUBSYSTEM SMBCALLS
-#######################
+smbcalls_config_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_config.o
+
+[MODULE::smbcalls_ldb]
+OUTPUT_TYPE = MERGED_OBJ
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_ldb
+PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
+
+smbcalls_ldb_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_ldb.o
+
+[MODULE::smbcalls_auth]
+OUTPUT_TYPE = MERGED_OBJ
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_auth
+PRIVATE_DEPENDENCIES = service_auth
+
+smbcalls_auth_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_auth.o
+
+smbcalls_auth_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_auth.o
+
+[MODULE::smbcalls_string]
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = MERGED_OBJ
+INIT_FUNCTION = smb_setup_ejs_string
+
+smbcalls_string_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_string.o
+
+[MODULE::smbcalls_sys]
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = MERGED_OBJ
+INIT_FUNCTION = smb_setup_ejs_system
+
+smbcalls_sys_OBJ_FILES = $(ejsscriptsrcdir)/smbcalls_sys.o
+
+[SUBSYSTEM::smbcalls]
+PRIVATE_DEPENDENCIES = \
+               EJS LIBSAMBA-UTIL \
+               MESSAGING \
+               LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
+               CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
+               NDR_TABLE
+
+smbcalls_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/, \
+               smbcalls.o \
+               smbcalls_options.o \
+               smbcalls_creds.o \
+               mprutil.o)
+
+$(eval $(call proto_header_template,$(ejsscriptsrcdir)/proto.h,$(smbcalls_OBJ_FILES:.o=.c)))
 
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
-INSTALLDIR = BINDIR
-OBJ_FILES = \
-               scripting/ejs/smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
 # End BINARY SMBSCRIPT
 #######################
+
+smbscript_OBJ_FILES = $(ejsscriptsrcdir)/smbscript.o