git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df34e80
)
s3:Makefile.in: use waf directly to build smbtorture4 and ndrdump4
author
Stefan Metzmacher
<metze@samba.org>
Sat, 5 Feb 2011 08:54:40 +0000
(09:54 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Sat, 5 Feb 2011 09:14:49 +0000
(10:14 +0100)
metze
source3/Makefile.in
patch
|
blob
|
history
diff --git
a/source3/Makefile.in
b/source3/Makefile.in
index ebfee9fbc9b2ab14b09d67a6a3669b1bb77d0449..6d5a3faf9d5df7bc72638bb75b2331c5aacedc2d 100644
(file)
--- a/
source3/Makefile.in
+++ b/
source3/Makefile.in
@@
-3474,21
+3474,24
@@
libnetapi_examples: libnetapi
clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean
clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean
-../source4/configure: ../buildtools/scripts/configure.waf
- cd ../source4 && ./autogen.sh
+WAF_BINARY=../buildtools/bin/waf
+WAF=$(WAF_BINARY)
+WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
+SAMBA4_BINARIES=smbtorture,ndrdump
-samba4-configure: ../source4/configure
- @CFLAGS='' $(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
- CFLAGS='' ./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
+samba4-configure:
+ @(cd ../source4 && \
+ CFLAGS='' $(WAF) reconfigure || \
+ CFLAGS='' $(WAF) configure --enable-developer --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
.PHONY: samba4-configure
bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
.PHONY: samba4-configure
bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
- cd ../source4 && $(
MAKE) bin/
smbtorture
+ cd ../source4 && $(
WAF_BUILD) --targets=
smbtorture
cp ../source4/bin/smbtorture bin/smbtorture4
bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
cp ../source4/bin/smbtorture bin/smbtorture4
bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
- cd ../source4 && $(
MAKE) bin/
ndrdump
+ cd ../source4 && $(
WAF_BUILD) --targets=
ndrdump
cp ../source4/bin/ndrdump bin/ndrdump4
.PHONY: bin/smbtorture4
cp ../source4/bin/ndrdump bin/ndrdump4
.PHONY: bin/smbtorture4