summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-23 19:25:05 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-23 19:25:05 +0200
commit3811156e979da6168fc5b427fa2cf03d73e8f6a7 (patch)
treed8925bc0e3a06a48ea42ad54163d16bdb1262aaa /source4
parenta203ee1ab18ea68c6df436f8bb9fc0772611d5d1 (diff)
downloadsamba-3811156e979da6168fc5b427fa2cf03d73e8f6a7.tar.gz
samba-3811156e979da6168fc5b427fa2cf03d73e8f6a7.tar.bz2
samba-3811156e979da6168fc5b427fa2cf03d73e8f6a7.zip
More work allowing out-of-tree builds. Patch by Matthias Dieter Wallnöfer and me.
(This used to be commit 6e29fbd5d06b02e2b0a55ae2994fce724aaa5bc5)
Diffstat (limited to 'source4')
-rw-r--r--source4/Makefile10
-rw-r--r--source4/build/make/rules.mk2
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 0ee36ec830..069fece855 100644
--- a/source4/Makefile
+++ b/source4/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/source4/build/make/rules.mk b/source4/build/make/rules.mk
index 176e67a691..27a214459a 100644
--- a/source4/build/make/rules.mk
+++ b/source4/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