r20792: fix the build, sorry...

metze
(This used to be commit e2cdd882b5ab12396244a13e0e58d8ee52f234ab)

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 0439d25d89792458cd0f75861624c3d65cf73ca2..98dad4596a0ac11c0700222bec1c9c363e77f4ae 100644 (file)
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -76,7 +76,7 @@ OBJ_FILES = \
                mprutil.o \
                literal.o
 PUBLIC_DEPENDENCIES = \
-               EJS EJSNET LIBSAMBA-UTIL \
+               EJS LIBSAMBA-UTIL \
                EJSRPC MESSAGING \
                LIBSAMBA-NET LIBCLI_SMB LIBPOPT \
                CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \
@@ -91,6 +91,6 @@ PUBLIC_DEPENDENCIES = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                smbscript.o
-PRIVATE_DEPENDENCIES = EJS EJSNET LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
 # End BINARY SMBSCRIPT
 #######################

diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk
index 6e624886d678344c2bc9403d06a062b4864675a0..ce71ff51df6a3b1ea2130534193d498a3ee46782 100644 (file)
--- a/source4/scripting/ejs/ejsnet/config.mk
+++ b/source4/scripting/ejs/ejsnet/config.mk
@@ -1,8 +1,9 @@
 [MODULE::smbcalls_net]
-PRIVATE_PROTO_HEADER = proto.h
-INIT_FUNCTION = smb_setup_ejs_net
 OBJ_FILES = \
                net_ctx.o \
                net_user.o \
                mpr_user.o
+SUBSYSTEM = smbcalls
+INIT_FUNCTION = smb_setup_ejs_net
+PRIVATE_PROTO_HEADER = proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index f58a59461a0843738f35c4e5a1cfb26709e4c70b..e837702ff8a9c91eefe108f7b07a8169cf86ffb7 100644 (file)
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -203,7 +203,7 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 
-void smb_set_ejs_net(void)
+void smb_setup_ejs_net(void)
 {
        ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
 }

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 40178d3754bff965383faf979cf882502ea3d634..24f48f8b7620783412af2cc71d87e9e383c3bb39 100644 (file)
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -22,8 +22,6 @@
 */
 
 #include "includes.h"
-#include "lib/appweb/ejs/ejs.h"
-#include "scripting/ejs/ejsnet/proto.h"
 #include "scripting/ejs/smbcalls.h"
 #include "build.h"
 #include "version.h"