diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-01-15 07:46:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:40:56 -0500 |
| commit | 64f27395a10fbf9ad95921ff0a8481b7afb0d02d (patch) | |
| tree | d2befa264e043c9309ee7b87e47ff03eb70d0acb | |
| parent | 0ec7ff5b6b8c7d498037bb68fc9cfead9e44dfc0 (diff) | |
| download | samba-64f27395a10fbf9ad95921ff0a8481b7afb0d02d.tar.gz samba-64f27395a10fbf9ad95921ff0a8481b7afb0d02d.tar.bz2 samba-64f27395a10fbf9ad95921ff0a8481b7afb0d02d.zip | |
r20792: fix the build, sorry...
metze
(This used to be commit e2cdd882b5ab12396244a13e0e58d8ee52f234ab)
| -rw-r--r-- | source4/scripting/ejs/config.mk | 4 | ||||
| -rw-r--r-- | source4/scripting/ejs/ejsnet/config.mk | 5 | ||||
| -rw-r--r-- | source4/scripting/ejs/ejsnet/net_ctx.c | 2 | ||||
| -rw-r--r-- | source4/scripting/ejs/smbcalls.c | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index 0439d25d89..98dad4596a 100644 --- 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 6e624886d6..ce71ff51df 100644 --- 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 f58a59461a..e837702ff8 100644 --- 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 40178d3754..24f48f8b76 100644 --- 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" |