[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1886-g7b9b3ec

Jelmer Vernooij jelmer at samba.org
Tue May 27 17:16:43 GMT 2008 

The branch, v4-0-test has been updated
       via  7b9b3ec02b27852cc32689a44c7f3fbbe43b7c6b (commit)
       via  683ba6de41b3fecc14c18502ff82b4fa617618e5 (commit)
       via  3fce4889b3f6ddc38e3dd3e1ffd4e7252f370883 (commit)
       via  b5d9d7a0affb4dcd8b89830e6967e4a14b512619 (commit)
       via  4e6fddda2e7d9e37f7b7ec99c5a58671f825a571 (commit)
       via  2c01d342b27832b930b81b04a90ed5630c6f470d (commit)
       via  269f8c9f6e9e5f6ad20319956573f09232b7c48f (commit)
       via  9f81214239e1cf6563da4ed49d051fe56d3ab129 (commit)
       via  0406713aad09b1ea4bd761519fd4897b94cfc7e5 (commit)
       via  fdc7c3568e5fbf510c874601d72798454b1c1ca6 (commit)
       via  49dcf4b8811f92684a7ddd266ac289d8fc8ca215 (commit)
       via  953f796059e16ea082391cfd6a018531a2a5be4e (commit)
       via  486d43355eb368c3f291ded5e353416e478ab862 (commit)
       via  4543633ba046836d13da80d07d06c272c3abf9bc (commit)
       via  5008116479209a1275d7f9b41ea293b27a8f7632 (commit)
       via  c5db384160aefc21141e94004faf4e89a204ff69 (commit)
       via  df603ad290700c2b286972cd7a6a28ac07f81f60 (commit)
       via  86ce8bf88acf3f9f9966ccf063bbf46d134ea4ba (commit)
       via  01c0000def9492989c543e7ed6d48c58a3be1854 (commit)
      from  c3f556915f09d078253e4c5539910a1cf420eeca (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 7b9b3ec02b27852cc32689a44c7f3fbbe43b7c6b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 18:46:05 2008 +0200

    Allow external use of regf idl.

commit 683ba6de41b3fecc14c18502ff82b4fa617618e5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 18:38:05 2008 +0200

    Use variables for IDL file paths.

commit 3fce4889b3f6ddc38e3dd3e1ffd4e7252f370883
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 18:29:00 2008 +0200

    Use variable path for heimdal glue code.

commit b5d9d7a0affb4dcd8b89830e6967e4a14b512619
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 18:20:29 2008 +0200

    Use variable for ndr_netlogon.o path.

commit 4e6fddda2e7d9e37f7b7ec99c5a58671f825a571
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 18:16:13 2008 +0200

    Simplify handling of source directory in et compile wrapper.

commit 2c01d342b27832b930b81b04a90ed5630c6f470d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 18:13:50 2008 +0200

    Simplify handling of source directory in asn compile wrapper.

commit 269f8c9f6e9e5f6ad20319956573f09232b7c48f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 17:21:13 2008 +0200

    Use variables in generated make fragments.

commit 9f81214239e1cf6563da4ed49d051fe56d3ab129
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 17:16:57 2008 +0200

    Don't throw away cflags if they start with a variable.

commit 0406713aad09b1ea4bd761519fd4897b94cfc7e5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 16:56:11 2008 +0200

    Move more CFLAGS to Makefile.

commit fdc7c3568e5fbf510c874601d72798454b1c1ca6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 16:44:04 2008 +0200

    Move source dir variables to Makefile.

commit 49dcf4b8811f92684a7ddd266ac289d8fc8ca215
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 16:23:12 2008 +0200

    Move CFLAGS that are not inherited out of smb_build.

commit 953f796059e16ea082391cfd6a018531a2a5be4e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 15:55:43 2008 +0200

    Use variables for et files too.

commit 486d43355eb368c3f291ded5e353416e478ab862
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 15:45:53 2008 +0200

    Move asn1 cflags definition to gmake.

commit 4543633ba046836d13da80d07d06c272c3abf9bc
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 15:38:13 2008 +0200

    use varibale for asn1 compiler.

commit 5008116479209a1275d7f9b41ea293b27a8f7632
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 15:34:09 2008 +0200

    Use variables for more object file paths.

commit c5db384160aefc21141e94004faf4e89a204ff69
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 15:32:44 2008 +0200

    Use heimdalsrcdir variable for automatic dependencies.

commit df603ad290700c2b286972cd7a6a28ac07f81f60
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 14:58:13 2008 +0200

    Use variable for heimdal source dir in static deps file.

commit 86ce8bf88acf3f9f9966ccf063bbf46d134ea4ba
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 14:46:09 2008 +0200

    Disable CFLAGS hack when include path starts with variable.

commit 01c0000def9492989c543e7ed6d48c58a3be1854
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 27 14:41:00 2008 +0200

    Use variable for socket wrapper include path.

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

Summary of changes:
 source/Makefile                              |   48 ++++++++++++++
 source/build/smb_build/config_mk.pm          |    2 -
 source/build/smb_build/makefile.pm           |    4 +
 source/heimdal_build/asn1_compile_wrapper.sh |   28 ++------
 source/heimdal_build/asn1_deps.pl            |    8 +-
 source/heimdal_build/config.mk               |   86 ++++++++++++++------------
 source/heimdal_build/et_compile_wrapper.sh   |   28 ++------
 source/heimdal_build/et_deps.pl              |    4 +-
 source/lib/ldb/python.mk                     |    2 +-
 source/lib/registry/config.mk                |    9 +--
 source/libcli/config.mk                      |    5 +-
 source/librpc/idl-deps.pl                    |    2 +-
 source/main.mk                               |   47 --------------
 source/static_deps.mk                        |   46 +++++++-------
 14 files changed, 149 insertions(+), 170 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index 069fece..370be2a 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -49,6 +49,54 @@ endif
 
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
+dynconfigsrcdir := dynconfig
+heimdalsrcdir := heimdal
+dsdbsrcdir := dsdb
+smbdsrcdir := smbd
+clustersrcdir := cluster
+libnetsrcdir := libnet
+authsrcdir := auth
+nsswitchsrcdir := nsswitch
+libsrcdir := lib
+libsocketsrcdir := lib/socket
+libcharsetsrcdir := lib/charset
+ldb_sambasrcdir := lib/ldb-samba
+libtlssrcdir := lib/tls
+libregistrysrcdir := lib/registry
+libmessagingsrcdir := lib/messaging
+libeventssrcdir := lib/events
+libcmdlinesrcdir := lib/cmdline
+socketwrappersrcdir := lib/socket_wrapper
+nsswrappersrcdir := lib/nss_wrapper
+appwebsrcdir := lib/appweb
+libstreamsrcdir := lib/stream
+libutilsrcdir := lib/util
+libtdrsrcdir := lib/tdr
+libdbwrapsrcdir := lib/dbwrap
+libcryptosrcdir := lib/crypto
+libtorturesrcdir := lib/torture
+smb_serversrcdir := smb_server
+libcompressionsrcdir := lib/compression
+libgencachesrcdir := lib
+paramsrcdir := param
+rpc_serversrcdir := rpc_server
+ldap_serversrcdir := ldap_server
+web_serversrcdir := web_server
+winbindsrcdir := winbind
+nbt_serversrcdir := nbt_server
+wrepl_serversrcdir := wrepl_server
+cldap_serversrcdir := cldap_server
+utilssrcdir := utils
+clientsrcdir := client
+torturesrcdir := torture
+ntvfssrcdir := ntvfs
+ntptrsrcdir := ntptr
+librpcsrcdir := librpc
+libclisrcdir := libcli
+ejsscriptsrcdir := scripting/ejs
+pyscriptsrcdir := $(srcdir)/scripting/python
+kdcsrcdir := kdc
+
 include data.mk
 
 BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 652a52f..8c7d752 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -25,7 +25,6 @@ my $section_types = {
 		"PUBLIC_DEPENDENCIES"	=> "list",
 		"ENABLE"		=> "bool",
 		"LDFLAGS"		=> "list",
-		"CFLAGS"		=> "list",
 	},
 	"SUBSYSTEM" => {
 		"PRIVATE_DEPENDENCIES"	=> "list",
@@ -60,7 +59,6 @@ my $section_types = {
 		"ENABLE"		=> "bool",
 
 		"INSTALLDIR"		=> "string",
-		"CFLAGS"		=> "list",
 		"LDFLAGS"		=> "list",
 		"STANDARD_VISIBILITY"	=> "string",
 
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 0269cfe..73801c2 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -262,6 +262,10 @@ sub CFlags($$)
 		if($src_ne_build) {
 			if($flag =~ m#^-I([^/].*$)#) {
 				my $dir = $1;
+				if ($dir =~ /^\$\(/) {
+					push (@cflags, $flag);
+					next;
+				}
 				$dir =~ s#^\$\((?:src|build)dir\)/?##;
 				push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
 				next;
diff --git a/source/heimdal_build/asn1_compile_wrapper.sh b/source/heimdal_build/asn1_compile_wrapper.sh
index 96677c7..c449bf8 100755
--- a/source/heimdal_build/asn1_compile_wrapper.sh
+++ b/source/heimdal_build/asn1_compile_wrapper.sh
@@ -4,21 +4,15 @@
 SELF=$0
 SELFDIR=`dirname ${SELF}`
 
-SRCDIR=$1
-BUILDDIR=$2
-DESTDIR=$3
+BUILDDIR=$1
+DESTDIR=$2
 
-CMD=$4
-FILE=$5
-NAME=$6
-shift 6
+CMD=$3
+FILE=$4
+NAME=$5
+shift 5
 OPTIONS="$@"
 
-test -z "${SRCDIR}" && {
-	echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2;
-	exit 1;
-}
-
 test -z "${BUILDDIR}" && {
 	echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2;
 	exit 1;
@@ -46,14 +40,6 @@ test -z "${NAME}" && {
 
 CURDIR=`pwd`
 
-cd ${SRCDIR} && {
-	ABS_SRCDIR=`pwd`
-	cd ${CURDIR}
-} || {
-	echo "${SELF}:cannot cd into '${SRCDIR}'" >&2;
-	exit 1;
-}
-
 cd ${BUILDDIR} && {
 	ABS_BUILDDIR=`pwd`
 	cd ${CURDIR}
@@ -63,7 +49,7 @@ cd ${BUILDDIR} && {
 }
 
 cd ${DESTDIR} && {
-	${ABS_BUILDDIR}/${CMD} ${OPTIONS} ${ABS_SRCDIR}/${FILE} ${NAME} >&2 || exit 1;
+	${ABS_BUILDDIR}/${CMD} ${OPTIONS} ${FILE} ${NAME} >&2 || exit 1;
 	cd ${CURDIR}
 } || {
 	echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2;
diff --git a/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl
index a2fbb5e..6121781 100755
--- a/source/heimdal_build/asn1_deps.pl
+++ b/source/heimdal_build/asn1_deps.pl
@@ -29,11 +29,11 @@ if (not defined $options) {
 
 my $header = "$dirname/$prefix.h";
 
-print "$header: $file bin/asn1_compile\n";
-print "\t\@echo \"Compiling ASN1 file $file\"\n";
-print "\t\@\$(builddir)/heimdal_build/asn1_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/asn1_compile $file $prefix $options\n\n";
+print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n";
+print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n";
+print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(abspath \$(heimdalsrcdir)/$file) $prefix $options\n\n";
 
-open(IN,$file) or die("Can't open $file: $!");
+open(IN,"heimdal/$file") or die("Can't open heimdal/$file: $!");
 my @lines = <IN>;
 close(IN);
 foreach my $line (@lines) {
diff --git a/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index 8011284..17fc8c9 100644
--- a/source/heimdal_build/config.mk
+++ b/source/heimdal_build/config.mk
@@ -408,24 +408,24 @@ HEIMDAL_WIND_OBJ_FILES = \
 #######################
 
 [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -Ilib/socket_wrapper
 
 HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.o
+$(HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
 
 [SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] 
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -Ilib/socket_wrapper
 
 HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.o
+$(HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
 
 [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H] 
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -Ilib/socket_wrapper
 
 HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.ho
+$(HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
-CFLAGS =  -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -Ilib/socket_wrapper
+CFLAGS =  -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)
 PUBLIC_DEPENDENCIES = \
 			HEIMDAL_ROKEN_GETPROGNAME \
 			HEIMDAL_ROKEN_CLOSEFROM \
@@ -463,7 +463,7 @@ HEIMDAL_ROKEN_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/roken/simple_exec.o \
 	$(heimdalsrcdir)/lib/roken/strcollect.o \
 	$(heimdalsrcdir)/lib/roken/rtbl.o \
-	./heimdal_build/replace.o
+	$(heimdalbuildsrcdir)/replace.o
 
 #######################
 # Start SUBSYSTEM HEIMDAL_GLUE
@@ -473,7 +473,7 @@ PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 
-HEIMDAL_GLUE_OBJ_FILES = heimdal_build/glue.o
+HEIMDAL_GLUE_OBJ_FILES = $(heimdalbuildsrcdir)/glue.o
 
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
@@ -490,19 +490,20 @@ HEIMDAL_COM_ERR_OBJ_FILES = \
 #######################
 # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken  -Ilib/socket_wrapper
 # End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 #######################
 
 HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/asn1/lex.ho 
+$(HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)
 
 #######################
 # Start BINARY asn1_compile
 [BINARY::asn1_compile]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
 USE_HOSTCC = YES
 PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
 
+ASN1C = $(builddir)/bin/asn1_compile
+
 asn1_compile_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/asn1/main.ho \
 	$(heimdalsrcdir)/lib/asn1/gen.ho \
@@ -524,8 +525,10 @@ asn1_compile_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/roken/ecalloc.ho \
 	$(heimdalsrcdir)/lib/asn1/symbol.ho \
 	$(heimdalsrcdir)/lib/vers/print_version.ho \
-	./lib/socket_wrapper/socket_wrapper.ho \
-	./heimdal_build/replace.ho
+	$(socketwrappersrcdir)/socket_wrapper.ho \
+	$(heimdalbuildsrcdir)/replace.ho
+
+$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/asn1
 
 # End BINARY asn1_compile
 #######################
@@ -533,7 +536,7 @@ asn1_compile_OBJ_FILES = \
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken  -Ilib/socket_wrapper
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken  -I$(socketwrappersrcdir)
 # End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 #######################
 
@@ -542,12 +545,13 @@ HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/com_err/lex.ho
 #######################
 # Start BINARY compile_et
 [BINARY::compile_et]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
 USE_HOSTCC = YES
 PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
 # End BINARY compile_et
 #######################
 
+ET_COMPILER = $(builddir)/bin/compile_et
+
 compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \
 	$(heimdalsrcdir)/lib/com_err/parse.ho \
 	$(heimdalsrcdir)/lib/com_err/compile_et.ho \
@@ -555,37 +559,38 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \
 	$(heimdalsrcdir)/lib/roken/get_window_size.ho \
 	$(heimdalsrcdir)/lib/roken/strupr.ho \
 	$(heimdalsrcdir)/lib/roken/setprogname.ho \
-	./lib/socket_wrapper/socket_wrapper.ho \
-	./heimdal_build/replace.ho
-
-
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hdb/hdb.asn1 hdb_asn1 heimdal/lib/hdb |
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/gssapi/spnego/spnego.asn1 spnego_asn1 heimdal/lib/gssapi --sequence=MechTypeList |
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/gssapi/mech/gssapi.asn1 gssapi_asn1 heimdal/lib/gssapi|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/k5.asn1 krb5_asn1 heimdal/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/digest.asn1 digest_asn1 heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkcs8.asn1 pkcs8_asn1 heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkcs9.asn1 pkcs9_asn1 heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkcs12.asn1 pkcs12_asn1 heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/rfc2459.asn1 rfc2459_asn1 heimdal/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/pkinit.asn1 pkinit_asn1 heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/CMS.asn1 cms_asn1 heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hx509/ocsp.asn1 ocsp_asn1 heimdal/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/kx509.asn1 kx509_asn1 heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hx509/pkcs10.asn1 pkcs10_asn1 heimdal/lib/hx509 --preserve-binary=CertificationRequestInfo|
+	$(socketwrappersrcdir)/socket_wrapper.ho \
+	$(heimdalbuildsrcdir)/replace.ho
+
+$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
+
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hdb/hdb.asn1 hdb_asn1 \$\(heimdalsrcdir\)/lib/hdb |
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/spnego/spnego.asn1 spnego_asn1 \$\(heimdalsrcdir\)/lib/gssapi --sequence=MechTypeList |
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/mech/gssapi.asn1 gssapi_asn1 \$\(heimdalsrcdir\)/lib/gssapi|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/k5.asn1 krb5_asn1 \$\(heimdalsrcdir\)/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/digest.asn1 digest_asn1 \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs8.asn1 pkcs8_asn1 \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs9.asn1 pkcs9_asn1 \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs12.asn1 pkcs12_asn1 \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/rfc2459.asn1 rfc2459_asn1 \$\(heimdalsrcdir\)/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkinit.asn1 pkinit_asn1 \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/CMS.asn1 cms_asn1 \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/ocsp.asn1 ocsp_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1 \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo|
 
 #
 # Ensure to update ./static_deps.mk when you add a new entry here!
 #
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/asn1/asn1_err.et heimdal/lib/asn1|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/hdb/hdb_err.et heimdal/lib/hdb|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/heim_err.et heimdal/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/k524_err.et heimdal/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb_err.et heimdal/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et heimdal/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/gssapi/krb5/gkrb5_err.et heimdal/lib/gssapi|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/hx509/hx509_err.et heimdal/lib/hx509|
-mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/wind/wind_err.et heimdal/lib/wind|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/asn1/asn1_err.et \$\(heimdalsrcdir\)/lib/asn1|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/hdb/hdb_err.et \$\(heimdalsrcdir\)/lib/hdb|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/heim_err.et \$\(heimdalsrcdir\)/lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/k524_err.et \$\(heimdalsrcdir\)/lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb_err.et \$\(heimdalsrcdir\)/lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb5_err.et \$\(heimdalsrcdir\)/lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/gssapi/krb5/gkrb5_err.et \$\(heimdalsrcdir\)/lib/gssapi|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/hx509/hx509_err.et \$\(heimdalsrcdir\)/lib/hx509|
+mkinclude perl_path_wrapper.sh et_deps.pl lib/wind/wind_err.et \$\(heimdalsrcdir\)/lib/wind|
 
 clean::	
 	@-rm -f bin/compile_et bin/asn1_compile
@@ -604,7 +609,6 @@ HEIMDAL_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.o
 #######################
 # Start BINARY compile_et
 [BINARY::samba4kinit]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
 PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM
 # End BINARY compile_et
 #######################
@@ -614,5 +618,7 @@ samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \
 	$(heimdalsrcdir)/lib/roken/setprogname.o \
 	$(heimdalsrcdir)/lib/roken/getarg.o 
 
+$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
+
 dist:: $(heimdalsrcdir)/lib/asn1/lex.c $(heimdalsrcdir)/lib/com_err/lex.c \
 	$(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c
diff --git a/source/heimdal_build/et_compile_wrapper.sh b/source/heimdal_build/et_compile_wrapper.sh
index d7d47ba..ec3b39f 100755
--- a/source/heimdal_build/et_compile_wrapper.sh
+++ b/source/heimdal_build/et_compile_wrapper.sh
@@ -4,19 +4,13 @@
 SELF=$0
 SELFDIR=`dirname ${SELF}`
 
-SRCDIR=$1
-BUILDDIR=$2
-DESTDIR=$3
+BUILDDIR=$1
+DESTDIR=$2
 
-CMD=$4
-FILE=$5
-SOURCE=$6
-shift 6
-
-test -z "${SRCDIR}" && {
-	echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2;
-	exit 1;
-}
+CMD=$3
+FILE=$4
+SOURCE=$5
+shift 5
 
 test -z "${BUILDDIR}" && {
 	echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2;
@@ -45,14 +39,6 @@ test -z "${SOURCE}" && {
 
 CURDIR=`pwd`
 
-cd ${SRCDIR} && {
-	ABS_SRCDIR=`pwd`
-	cd ${CURDIR}
-} || {
-	echo "${SELF}:cannot cd into '${SRCDIR}'" >&2;
-	exit 1;
-}
-
 cd ${BUILDDIR} && {
 	ABS_BUILDDIR=`pwd`
 	cd ${CURDIR}
@@ -62,7 +48,7 @@ cd ${BUILDDIR} && {
 }
 
 cd ${DESTDIR} && {
-	${ABS_BUILDDIR}/${CMD} ${ABS_SRCDIR}/${FILE} >&2 || exit 1;
+	${ABS_BUILDDIR}/${CMD} ${FILE} >&2 || exit 1;
 	cd ${CURDIR}
 	TMP="${SOURCE}.$$"
 	mv ${SOURCE} ${TMP} && {
diff --git a/source/heimdal_build/et_deps.pl b/source/heimdal_build/et_deps.pl
index 2385dbd..6a0485b 100755
--- a/source/heimdal_build/et_deps.pl
+++ b/source/heimdal_build/et_deps.pl
@@ -8,9 +8,9 @@ my $basename = basename($file);
 
 my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
 my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
-print "$header $source: $file bin/compile_et\n";
+print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n";
 print "\t\@echo \"Compiling error table $file\"\n";
-print "\t\@\$(builddir)/heimdal_build/et_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/compile_et $file $source\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(abspath \$(heimdalsrcdir)/$file) $source\n\n";
 
 print "clean:: \n";
 print "\t\@rm -f $header $source\n\n";
diff --git a/source/lib/ldb/python.mk b/source/lib/ldb/python.mk
index 96ae6a5..5325446 100644
--- a/source/lib/ldb/python.mk
+++ b/source/lib/ldb/python.mk
@@ -1,9 +1,9 @@
 [PYTHON::swig_ldb]
 LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBLDB
-CFLAGS = -I$(ldbdir)/include
 
 swig_ldb_OBJ_FILES = $(ldbdir)/ldb_wrap.o
+$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 $(eval $(call python_py_module_template,ldb.py,$(ldbdir)/ldb.py))
 
diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 44adc53..fd1fd01 100644
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -5,12 +5,11 @@ TDR_REGF_OBJ_FILES = $(libregistrysrcdir)/tdr_regf.o
 
 # Special support for external builddirs
 $(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
-$(srcdir)/$(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
 $(libregistrysrcdir)/tdr_regf.h: $(libregistrysrcdir)/tdr_regf.c
-$(libregistrysrcdir)/tdr_regf.c: $(srcdir)/$(libregistrysrcdir)/regf.idl
-	@CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
-		--header --outputdir=lib/registry \
-		--tdr-parser -- $(srcdir)/$(libregistrysrcdir)/regf.idl
+$(libregistrysrcdir)/tdr_regf.c: $(libregistrysrcdir)/regf.idl
+	@CPP="$(CPP)" $(PERL) $(pidldir)/pidl $(PIDL_ARGS) \
+		--header --outputdir=$(libregistrysrcdir) \
+		--tdr-parser -- $(libregistrysrcdir)/regf.idl
 
 clean::
 	@-rm -f $(libregistrysrcdir)/regf.h $(libregistrysrcdir)/tdr_regf*
diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index b24f3eb..02711ee 100644
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -61,15 +61,14 @@ $(eval $(call proto_header_template,$(libclisrcdir)/nbt/nbt_proto.h,$(LIBCLI_NBT
 PUBLIC_DEPENDENCIES = LIBNDR  \
 	NDR_SECURITY 	
 
-LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix libcli/, \
-	ndr_netlogon.o)
+LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix $(libclisrcdir)/, ndr_netlogon.o)
 
 $(eval $(call proto_header_template,$(libclisrcdir)/ndr_netlogon_proto.h,$(LIBCLI_NDR_NETLOGON_OBJ_FILES:.o=.c)))
 
 [SUBSYSTEM::LIBCLI_NETLOGON]
 PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_NDR_NETLOGON
 
-LIBCLI_NETLOGON_OBJ_FILES = $(addprefix libcli/, \
+LIBCLI_NETLOGON_OBJ_FILES = $(addprefix $(libclisrcdir)/, \
 	netlogon.o)
 
 $(eval $(call proto_header_template,$(libclisrcdir)/netlogon_proto.h,$(LIBCLI_NETLOGON_OBJ_FILES:.o=.c)))
diff --git a/source/librpc/idl-deps.pl b/source/librpc/idl-deps.pl
index e630ee4..49fba4c 100755
--- a/source/librpc/idl-deps.pl
+++ b/source/librpc/idl-deps.pl
@@ -4,8 +4,8 @@ use strict;
 my %vars = ();
 
 foreach(@ARGV) {
-	push (@{$vars{IDL_FILES}}, $_);


-- 
Samba Shared Repository

More information about the samba-cvs mailing list