svn commit: samba r20792 - in branches/SAMBA_4_0/source/scripting/ejs: . ejsnet

[metze at samba.org]

Author: metze
Date: 2007-01-15 07:46:36 +0000 (Mon, 15 Jan 2007)
New Revision: 20792

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20792

Log:
fix the build, sorry...

metze
Modified:
   branches/SAMBA_4_0/source/scripting/ejs/config.mk
   branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk
   branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk	2007-01-15 07:34:04 UTC (rev 20791)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk	2007-01-15 07:46:36 UTC (rev 20792)
@@ -76,7 +76,7 @@
 		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 @@
 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
 #######################

Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk	2007-01-15 07:34:04 UTC (rev 20791)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/config.mk	2007-01-15 07:46:36 UTC (rev 20792)
@@ -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

Modified: branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c	2007-01-15 07:34:04 UTC (rev 20791)
+++ branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c	2007-01-15 07:46:36 UTC (rev 20792)
@@ -203,7 +203,7 @@
 }
 
 
-void smb_set_ejs_net(void)
+void smb_setup_ejs_net(void)
 {
 	ejsDefineCFunction(-1, "NetContext", ejs_net_context, NULL, MPR_VAR_SCRIPT_HANDLE);
 }

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c	2007-01-15 07:34:04 UTC (rev 20791)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c	2007-01-15 07:46:36 UTC (rev 20792)
@@ -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"