Author: jelmer Date: 2006-03-20 23:35:08 +0000 (Mon, 20 Mar 2006) New Revision: 14594
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14594 Log: Fix some dependencies (required for shared library build) Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/lib/ldb/common/ldb.c branches/SAMBA_4_0/source/lib/ldb/config.mk branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/pidl/TODO branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm branches/SAMBA_4_0/source/scripting/ejs/config.mk Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-20 23:30:55 UTC (rev 14593) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-20 23:35:08 UTC (rev 14594) @@ -505,8 +505,8 @@ # nasty hack to allow running locally if ($self->{duplicate_build}) { - $self->output("bin/libdynconfig.\$(SHLIBEXT): dynconfig-devel.o\n"); - $self->output("bin/libdynconfig.\$(SHLIBEXT): LIBRARY_DYNCONFIG_OBJ_LIST=dynconfig-devel.o\n"); + $self->output("bin/libdynconfig.\$(SHLIBEXT).0.0.1: dynconfig-devel.o\n"); + $self->output("bin/libdynconfig.\$(SHLIBEXT).0.0.1: LIBRARY_DYNCONFIG_OBJ_LIST=dynconfig-devel.o\n"); } $self->_prepare_mk_files(); Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/common/ldb.c 2006-03-20 23:30:55 UTC (rev 14593) +++ branches/SAMBA_4_0/source/lib/ldb/common/ldb.c 2006-03-20 23:35:08 UTC (rev 14594) @@ -106,7 +106,7 @@ ldb_connect_fn fn; if (strchr(url, ':') != NULL) { - backend = talloc_strndup(ldb, url, strchr(url, ':')-url); + backend = talloc_strndup(ldb, url, strchr(url, ':')-url-1); } else { /* Default to tdb */ backend = talloc_strdup(ldb, "tdb"); Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-03-20 23:30:55 UTC (rev 14593) +++ branches/SAMBA_4_0/source/lib/ldb/config.mk 2006-03-20 23:35:08 UTC (rev 14594) @@ -82,8 +82,8 @@ ################################################ # Start MODULE ldb_map -[MODULE::ldb_map] -SUBSYSTEM = ldb +[SUBSYSTEM::ldb_map] +REQUIRED_SUBSYSTEMS = ldb OBJ_FILES = modules/ldb_map.o # End MODULE ldb_map ################################################ @@ -126,13 +126,16 @@ # End MODULE ldb_tdb ################################################ +./lib/ldb/common/ldb_modules.o: lib/ldb/common/ldb_modules.c Makefile + @echo Compiling $< + @$(CC) $(CFLAGS) $(PICFLAG) -DMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" -c $< -o $@ + ################################################ # Start SUBSYSTEM ldb [LIBRARY::ldb] VERSION = 0.0.1 SO_VERSION = 0 DESCRIPTION = LDAP-like embedded database library -EXTRA_CFLAGS = -DMODULESDIR="$(MODULESDIR)/ldb" -DSHLIBEXT="$(SHLIBEXT)" INIT_FUNCTION_TYPE = int (*) (void) OBJ_FILES = \ common/ldb.o \ Modified: branches/SAMBA_4_0/source/librpc/config.mk =================================================================== --- branches/SAMBA_4_0/source/librpc/config.mk 2006-03-20 23:30:55 UTC (rev 14593) +++ branches/SAMBA_4_0/source/librpc/config.mk 2006-03-20 23:35:08 UTC (rev 14594) @@ -627,7 +627,7 @@ INIT_FUNCTION = ejs_init_samr OBJ_FILES = gen_ndr/ndr_samr_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR EJSRPC RPC_EJS_LSA RPC_EJS_SECURITY RPC_EJS_MISC [MODULE::RPC_EJS_SECURITY] INIT_FUNCTION = ejs_init_security @@ -639,7 +639,7 @@ INIT_FUNCTION = ejs_init_lsarpc OBJ_FILES = gen_ndr/ndr_lsa_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA EJSRPC RPC_EJS_SECURITY [MODULE::RPC_EJS_DFS] INIT_FUNCTION = ejs_init_netdfs @@ -651,7 +651,7 @@ INIT_FUNCTION = ejs_init_drsuapi OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI EJSRPC RPC_EJS_MISC [MODULE::RPC_EJS_SPOOLSS] INIT_FUNCTION = ejs_init_spoolss @@ -664,25 +664,25 @@ INIT_FUNCTION = ejs_init_wkssvc OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC EJSRPC RPC_EJS_SRVSVC RPC_EJS_MISC [MODULE::RPC_EJS_SRVSVC] INIT_FUNCTION = ejs_init_srvsvc OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC EJSRPC RPC_EJS_MISC [MODULE::RPC_EJS_EVENTLOG] INIT_FUNCTION = ejs_init_eventlog OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG EJSRPC RPC_EJS_MISC [MODULE::RPC_EJS_WINREG] INIT_FUNCTION = ejs_init_winreg OBJ_FILES = gen_ndr/ndr_winreg_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG EJSRPC RPC_EJS_INITSHUTDOWN [MODULE::RPC_EJS_INITSHUTDOWN] INIT_FUNCTION = ejs_init_initshutdown @@ -694,13 +694,13 @@ INIT_FUNCTION = ejs_init_netlogon OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC RPC_EJS_SAMR +REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC RPC_EJS_SAMR RPC_EJS_SECURITY RPC_EJS_MISC [MODULE::RPC_EJS_SVCCTL] INIT_FUNCTION = ejs_init_svcctl OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL EJSRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL EJSRPC RPC_EJS_MISC [MODULE::RPC_EJS_IRPC] INIT_FUNCTION = ejs_init_irpc Modified: branches/SAMBA_4_0/source/pidl/TODO =================================================================== --- branches/SAMBA_4_0/source/pidl/TODO 2006-03-20 23:30:55 UTC (rev 14593) +++ branches/SAMBA_4_0/source/pidl/TODO 2006-03-20 23:35:08 UTC (rev 14594) @@ -14,3 +14,5 @@ - replace subcontext() with represent_as() - --explain-ndr option that dumps out parse tree ? + +- seperate tables for NDR and DCE/RPC Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm =================================================================== --- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2006-03-20 23:30:55 UTC (rev 14593) +++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2006-03-20 23:35:08 UTC (rev 14594) @@ -124,7 +124,7 @@ if (has_property($fn, "public")) { pidl_hdr "$decl;\n"; - pidl "$decl"; + pidl "_PUBLIC_ $decl"; } else { pidl "static $decl"; } Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2006-03-20 23:30:55 UTC (rev 14593) +++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2006-03-20 23:35:08 UTC (rev 14594) @@ -27,7 +27,6 @@ INIT_FUNCTION = smb_setup_ejs_samba3 REQUIRED_SUBSYSTEMS = LIBSAMBA3 - [MODULE::smbcalls_rand] OBJ_FILES = smbcalls_rand.o SUBSYSTEM = smbcalls
