The branch, master has been updated via 2c1279f... s3-build: some makefile cosmetics. via 2356496... s3-build: add IDL_FILES variable. from 87df785... s4-dsdb: use ldb_operr() in the dsdb code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2c1279f454124c9921bce7005b3bc8296c9fc4aa Author: Günther Deschner <g...@samba.org> Date: Wed Jul 7 13:40:48 2010 +0200 s3-build: some makefile cosmetics. Guenther commit 2356496ac6490aa82d37b8d9436d6d40979d2e80 Author: Günther Deschner <g...@samba.org> Date: Wed Jul 7 13:44:42 2010 +0200 s3-build: add IDL_FILES variable. Guenther ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 32 ++++++++++++++++++++------------ source3/wscript_build | 6 ++++-- 2 files changed, 24 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 4cfcbbe..8291f41 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -322,9 +322,15 @@ LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \ LIBNDR_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon.o \ ../librpc/ndr/ndr_netlogon.o +LIBNDR_SCHANNEL_OBJ = librpc/gen_ndr/ndr_schannel.o \ + ../librpc/ndr/ndr_schannel.o + LIBNDR_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss.o \ ../librpc/ndr/ndr_spoolss_buf.o +LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \ + ../librpc/ndr/ndr_ntprinting.o \ + LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \ $(LIBNDR_GEN_OBJ0) \ librpc/gen_ndr/ndr_dfs.o \ @@ -510,8 +516,7 @@ TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o SCHANNEL_OBJ = ../libcli/auth/credentials.o \ ../libcli/auth/schannel_sign.o \ ../libcli/auth/schannel_state_tdb.o \ - librpc/gen_ndr/ndr_schannel.o \ - ../librpc/ndr/ndr_schannel.o + $(LIBNDR_SCHANNEL_OBJ) LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ libsmb/clikrb5.o libsmb/clispnego.o \ @@ -1033,8 +1038,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \ utils/net_serverid.o \ utils/net_eventlog.o \ utils/net_printing.o \ - librpc/gen_ndr/ndr_ntprinting.o \ - ../librpc/ndr/ndr_ntprinting.o + $(LIBNDR_NTPRINTING_OBJ) + # these are not processed by make proto NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o @@ -1414,23 +1419,26 @@ modules:: SHOWFLAGS $(MODULES) ##################################################################### ## Perl IDL Compiler + +IDL_FILES = librpc/idl/messaging.idl \ + librpc/idl/libnetapi.idl \ + librpc/idl/notify.idl \ + librpc/idl/wbint.idl \ + librpc/idl/perfcount.idl \ + librpc/idl/secrets.idl \ + librpc/idl/libnet_join.idl + samba3-idl:: @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \ srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/*.idl @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \ - srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh \ - librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl \ - librpc/idl/wbint.idl librpc/idl/perfcount.idl \ - librpc/idl/secrets.idl librpc/idl/libnet_join.idl + srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(IDL_FILES) idl_full:: @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \ srcdir="$(srcdir)" ../librpc/build_idl.sh --full ../librpc/idl/*.idl @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \ - srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full \ - librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl \ - librpc/idl/wbint.idl librpc/idl/perfcount.idl \ - librpc/idl/secrets.idl librpc/idl/libnet_join.idl + srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES) ##################################################################### diff --git a/source3/wscript_build b/source3/wscript_build index 337b840..e231a41 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -62,6 +62,9 @@ LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c''' +LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c + ../librpc/ndr/ndr_schannel.c''' + LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c ../librpc/ndr/ndr_spoolss_buf.c''' @@ -255,8 +258,7 @@ TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c''' SCHANNEL_SRC = '''../libcli/auth/credentials.c ../libcli/auth/schannel_sign.c ../libcli/auth/schannel_state_tdb.c - ../librpc/gen_ndr/ndr_schannel.c - ../librpc/ndr/ndr_schannel.c''' + ${LIBNDR_SCHANNEL_SRC}''' LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/clikrb5.c libsmb/clispnego.c -- Samba Shared Repository