[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1773-g6e29fbd

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  6e29fbd5d06b02e2b0a55ae2994fce724aaa5bc5 (commit)
      from  86a8a085496c292b390c0d6362e3e4d9980df83f (commit)

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


- Log -----------------------------------------------------------------
commit 6e29fbd5d06b02e2b0a55ae2994fce724aaa5bc5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri May 23 19:25:05 2008 +0200

    More work allowing out-of-tree builds. Patch by Matthias Dieter Wallnöfer and me.

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

Summary of changes:
 source/Makefile            |   10 +++++-----
 source/build/make/rules.mk |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index 0ee36ec..069fece 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -6,7 +6,7 @@ include mkconfig.mk
 
 pidldir := $(srcdir)/pidl
 
-VPATH = $(builddir):$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
+VPATH = $(builddir):$(srcdir):$(srcdir)/heimdal_build:$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des
 
 BASEDIR = $(prefix)
 TORTUREDIR = $(libdir)/torture
@@ -47,8 +47,8 @@ ALL_PREDEP = basics
 .NOTPARALLEL:
 endif
 
-include build/make/rules.mk
-include build/make/python.mk
+include $(srcdir)/build/make/rules.mk
+include $(srcdir)/build/make/python.mk
 include data.mk
 
 BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
@@ -233,8 +233,8 @@ data.mk: config.status $(MK_FILES)
 
 testcov-html:: 
 
-include pidl/config.mk
-include selftest/config.mk
+include $(pidldir)/config.mk
+include $(srcdir)/selftest/config.mk
 
 showflags::
 	@echo '  pwd        = '`/bin/pwd`
diff --git a/source/build/make/rules.mk b/source/build/make/rules.mk
index 176e67a..27a2144 100644
--- a/source/build/make/rules.mk
+++ b/source/build/make/rules.mk
@@ -86,7 +86,7 @@ unused_macros:
 	@mkdir -p $(@D)
 	@$(STLD) $(STLD_FLAGS) $@ $^
 
-include build/make/templates.mk
+include $(make_utility_dir)/templates.mk
 
 ###############################################################################
 # File types


-- 
Samba Shared Repository