[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  7b1efc7 s3-build: only link LIBNDR_XATTR_OBJ where needed.
       via  32a1b21 s3-waf: only link LIBNDR_XATTR_SRC where needed.
       via  a1392ee s3-build: link ndr_notify only where needed.
       via  b15ac83 s3-waf: link ndr_notify only where needed.
       via  ed239fc s3-build: link ndr_named_pipe_auth only where needed.
       via  f8b10a7 s3-waf: link ndr_named_pipe_auth only where needed.
      from  26ea51c s3-spoolss: allow a short printername w/o servername.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7b1efc7282ea0a2e2f7ba84c5c2bb3cd0c6f52c5
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 10 11:28:54 2010 +0200

    s3-build: only link LIBNDR_XATTR_OBJ where needed.
    
    Guenther

commit 32a1b21f1c65589a142919f85cf78ece169d3d92
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 10 11:28:38 2010 +0200

    s3-waf: only link LIBNDR_XATTR_SRC where needed.
    
    Guenther

commit a1392ee9a04765d849e1d297fb5f156ad169afd0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 10 11:27:52 2010 +0200

    s3-build: link ndr_notify only where needed.
    
    Guenther

commit b15ac83bda4adbdfc7b7e04ad126cffd8d44efba
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 10 11:26:35 2010 +0200

    s3-waf: link ndr_notify only where needed.
    
    Guenther

commit ed239fc784299e6cfc4417101fdefbc413d6531c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 10 11:24:28 2010 +0200

    s3-build: link ndr_named_pipe_auth only where needed.
    
    Guenther

commit f8b10a738c5da88a72fa969e217f6c72016d44b0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 10 11:23:59 2010 +0200

    s3-waf: link ndr_named_pipe_auth only where needed.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in   |   12 ++++++------
 source3/wscript_build |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4f0cbe7..939a32b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -401,10 +401,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
 		 librpc/gen_ndr/ndr_eventlog.o \
 		 $(LIBNDR_NETLOGON_OBJ) \
 		 librpc/gen_ndr/ndr_dssetup.o \
-		 librpc/gen_ndr/ndr_notify.o \
-		 $(LIBNDR_XATTR_OBJ) \
 		 librpc/gen_ndr/ndr_epmapper.o \
-		 librpc/gen_ndr/ndr_named_pipe_auth.o \
 		 librpc/gen_ndr/ndr_ntsvcs.o \
 		 $(LIBNDR_SPOOLSS_OBJ)
 
@@ -702,7 +699,8 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss_nt.o \
 RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \
 		   $(LIB_EVENTLOG_OBJ) librpc/gen_ndr/srv_eventlog.o
 
-NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o
+NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \
+		  librpc/gen_ndr/ndr_named_pipe_auth.o
 
 RPC_NCACN_NP_INTERNAL = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np_internal.o \
 			rpc_server/rpc_handles.o
@@ -757,7 +755,8 @@ PROFILES_OBJ = utils/profiles.o \
 OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o \
 	     smbd/oplock_onefs.o
 
-NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o
+NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \
+	     librpc/gen_ndr/ndr_notify.o
 
 FNAME_UTIL_OBJ = smbd/filename_util.o
 
@@ -898,7 +897,8 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
 		$(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
 		$(SMBLDAP_OBJ) $(LIBNET_OBJ) \
 		$(LIBSMBCONF_OBJ) \
-		$(PRIVILEGES_BASIC_OBJ)
+		$(PRIVILEGES_BASIC_OBJ) \
+		$(LIBNDR_XATTR_OBJ)
 
 PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
                printing/print_cups.o printing/print_generic.o \
diff --git a/source3/wscript_build b/source3/wscript_build
index fee1a21..4e03b74 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -149,10 +149,7 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ../librpc/gen_ndr/ndr_eventlog.c
                  ${LIBNDR_NETLOGON_SRC}
                  ../librpc/gen_ndr/ndr_dssetup.c
-                 librpc/gen_ndr/ndr_notify.c
-                 ${LIBNDR_XATTR_SRC}
                  ../librpc/gen_ndr/ndr_epmapper.c
-                 ../librpc/gen_ndr/ndr_named_pipe_auth.c
                  ../librpc/gen_ndr/ndr_ntsvcs.c
                  ${LIBNDR_SPOOLSS_SRC}'''
 
@@ -460,7 +457,8 @@ RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
 RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
                    ${LIB_EVENTLOG_SRC} ../librpc/gen_ndr/srv_eventlog.c'''
 
-NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
+NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
+                     ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
 
 RPC_NCACN_NP_INTERNAL = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np_internal.c
                         rpc_server/rpc_handles.c'''
@@ -518,7 +516,8 @@ PROFILES_SRC = '''utils/profiles.c
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
              smbd/oplock_onefs.c'''
 
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
+                librpc/gen_ndr/ndr_notify.c'''
 
 FNAME_UTIL_SRC = '''smbd/filename_util.c'''
 
@@ -810,7 +809,8 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 rpc_client/init_netlogon.c
                 rpc_client/init_samr.c
                 ${AUTH_SRC}
-                ${PRIVILEGES_BASIC_SRC}'''
+                ${PRIVILEGES_BASIC_SRC}
+                ${LIBNDR_XATTR_SRC}'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c


-- 
Samba Shared Repository