Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet

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

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index f56b75e537d4b4164d91fcde63cd1584c8b196ab..656ecdae1622c1023dfe084ae7c8b7928b6e46a9 100644 (file)
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -1,33 +1,105 @@
-#######################
-# Start LIBRARY EJSRPC
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
-               scripting/ejs/ejsrpc.o
-REQUIRED_SUBSYSTEMS = RPC_EJS_ECHO RPC_EJS_SAMR RPC_EJS_MISC RPC_EJS_SECURITY RPC_EJS_LSA
-NOPROTO = YES
-# End SUBSYSTEM EJSRPC
-#######################
+               ejsrpc.o
 
-#######################
-# Start LIBRARY SMBCALLS
-[SUBSYSTEM::SMBCALLS]
+[MODULE::smbcalls_config]
+OBJ_FILES = smbcalls_config.o
+OUTPUT_TYPE = INTEGRATED
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_config
+
+[MODULE::smbcalls_ldb]
+OBJ_FILES = smbcalls_ldb.o
+OUTPUT_TYPE = INTEGRATED
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_ldb
+PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
+
+[MODULE::smbcalls_reg]
+OBJ_FILES = smbcalls_reg.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_reg
+PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
+
+[MODULE::smbcalls_nbt]
+OBJ_FILES = smbcalls_nbt.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_nbt
+
+[MODULE::smbcalls_samba3]
+OBJ_FILES = smbcalls_samba3.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_samba3
+PRIVATE_DEPENDENCIES = LIBSAMBA3 
+
+[MODULE::smbcalls_rand]
+OBJ_FILES = smbcalls_rand.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_random
+
+[MODULE::smbcalls_nss]
+OBJ_FILES = smbcalls_nss.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_nss
+PRIVATE_DEPENDENCIES = NSS_WRAPPER
+
+[MODULE::smbcalls_data]
+OBJ_FILES = smbcalls_data.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_datablob
+
+[MODULE::smbcalls_auth]
+OBJ_FILES = smbcalls_auth.o
+OUTPUT_TYPE = INTEGRATED
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_auth
+PRIVATE_DEPENDENCIES = auth
+
+[MODULE::smbcalls_string]
+OBJ_FILES = smbcalls_string.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_string
+
+[MODULE::smbcalls_sys]
+OBJ_FILES = smbcalls_sys.o
+SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
+INIT_FUNCTION = smb_setup_ejs_system
+
+include ejsnet/config.mk
+
+[SUBSYSTEM::smbcalls]
+PRIVATE_PROTO_HEADER = proto.h
 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/mprutil.o
-REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC
-# End SUBSYSTEM SMBCALLS
-#######################
+               smbcalls.o \
+               smbcalls_cli.o \
+               smbcalls_rpc.o \
+               smbcalls_options.o \
+               smbcalls_creds.o \
+               smbcalls_param.o \
+               mprutil.o \
+               literal.o
+PRIVATE_DEPENDENCIES = \
+               EJS LIBSAMBA-UTIL \
+               EJSRPC MESSAGING \
+               LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
+               CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
+               dcerpc \
+               NDR_TABLE
 
 #######################
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
+INSTALLDIR = BINDIR
 OBJ_FILES = \
-               scripting/ejs/smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG LIBSMB RPC LIBCMDLINE
+               smbscript.o
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
 # End BINARY SMBSCRIPT
 #######################