[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  2d23ddb s3-build: only link in prs parser where needed.
       via  f705125 s3-waf: only link in prs parser where needed.
      from  5a0bb22 cldap: prevent crashes when freeing cldap socket

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


- Log -----------------------------------------------------------------
commit 2d23ddb68d20a7e10297841ff7a550c03a8c6b74
Author: Günther Deschner <gd at samba.org>
Date:   Tue Sep 14 23:58:10 2010 +0200

    s3-build: only link in prs parser where needed.
    
    Guenther

commit f7051250eab1bb3336b3159e3b9a077a0e046263
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 15 08:22:37 2010 +0200

    s3-waf: only link in prs parser where needed.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 321eb3c..cde2d7d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -541,7 +541,6 @@ LIBSMB_ERR_OBJ0 = $(NTERR_OBJ) $(DOSERR_OBJ) $(ERRORMAP_OBJ) $(DCE_RPC_ERR_OBJ)
 LIBSMB_ERR_OBJ1 = ../libcli/auth/smbdes.o ../libcli/auth/smbencrypt.o ../libcli/auth/msrpc_parse.o ../libcli/auth/session.o
 
 LIBSMB_ERR_OBJ = $(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) \
-		 $(REG_PARSE_PRS_OBJ) \
 		 $(SECRETS_OBJ)
 
 LIBSMB_OBJ0 = \
@@ -617,7 +616,8 @@ REG_INIT_BASIC_OBJ = registry/reg_init_basic.o
 REG_INIT_SMBCONF_OBJ = registry/reg_init_smbconf.o
 REG_INIT_FULL_OBJ = registry/reg_init_full.o
 
-REGFIO_OBJ = registry/regfio.o
+REGFIO_OBJ = registry/regfio.o \
+	     $(REG_PARSE_PRS_OBJ)
 
 REGOBJS_OBJ = registry/reg_objects.o
 
diff --git a/source3/wscript_build b/source3/wscript_build
index 734b64c..61b9af4 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -303,7 +303,7 @@ LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SR
 
 LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
 
-LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1} ${REG_PARSE_PRS_SRC}'
+LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}'
 
 LIBSMB_SRC0 = '''
                ../libcli/auth/ntlm_check.c
@@ -373,7 +373,7 @@ REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
 REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
 
-REGFIO_SRC = '''registry/regfio.c'''
+REGFIO_SRC = '''registry/regfio.c ${REG_PARSE_PRS_SRC}'''
 
 REGSRCS_SRC = '''registry/reg_objects.c'''
 


-- 
Samba Shared Repository