[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Wed Nov 3 16:45:02 MDT 2010
The branch, master has been updated
via 14718a7 build: a more portable way of finding waf in makefiles
from fdcbc08 selftest/tests.py: Fix typos.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 14718a725b65828c470167b922260840343d9843
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Nov 4 08:29:11 2010 +1100
build: a more portable way of finding waf in makefiles
this avoids using the non-portable shell command in makefiles
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Wed Nov 3 22:44:59 UTC 2010 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/replace/Makefile | 4 +---
lib/talloc/Makefile | 4 +---
lib/tevent/Makefile | 4 +---
source4/lib/ldb/Makefile | 4 +---
4 files changed, 4 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/Makefile b/lib/replace/Makefile
index 3082459..5b8220c 100644
--- a/lib/replace/Makefile
+++ b/lib/replace/Makefile
@@ -1,8 +1,6 @@
# simple makefile wrapper to run waf
-WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
all:
$(WAF) build
diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
index 3082459..5b8220c 100644
--- a/lib/talloc/Makefile
+++ b/lib/talloc/Makefile
@@ -1,8 +1,6 @@
# simple makefile wrapper to run waf
-WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
all:
$(WAF) build
diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile
index 3f188a9..f178363 100644
--- a/lib/tevent/Makefile
+++ b/lib/tevent/Makefile
@@ -1,8 +1,6 @@
# simple makefile wrapper to run waf
-WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
all:
$(WAF) build
diff --git a/source4/lib/ldb/Makefile b/source4/lib/ldb/Makefile
index 3d0d8e4..da05bcf 100644
--- a/source4/lib/ldb/Makefile
+++ b/source4/lib/ldb/Makefile
@@ -1,8 +1,6 @@
# simple makefile wrapper to run waf
-WAFPATH:=$(shell PATH=../../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../../buildtools/bin:$$PATH waf
all:
$(WAF) build
--
Samba Shared Repository
More information about the samba-cvs
mailing list