From 7e01efa80fc6262bf5558b213fa572f4253316dc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 23 Feb 2010 14:59:47 +1100 Subject: build: improve the wscript generator --- buildtools/mktowscript/mklist.txt | 1 + buildtools/mktowscript/mktowscript.pl | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'buildtools/mktowscript') diff --git a/buildtools/mktowscript/mklist.txt b/buildtools/mktowscript/mklist.txt index 3e0e1a1959..8a9a6c549a 100644 --- a/buildtools/mktowscript/mklist.txt +++ b/buildtools/mktowscript/mklist.txt @@ -1,4 +1,5 @@ source4/main.mk +source4/lib/basic.mk pidl/config.mk nsswitch/config.mk nsswitch/libwbclient/config.mk diff --git a/buildtools/mktowscript/mktowscript.pl b/buildtools/mktowscript/mktowscript.pl index 18c8779055..5dc4e1b944 100755 --- a/buildtools/mktowscript/mktowscript.pl +++ b/buildtools/mktowscript/mktowscript.pl @@ -34,6 +34,14 @@ sub strlist($) $s =~ s/\$\(param_OBJ_FILES\)/..\/pyparam.c/g; $s =~ s/\$\(libclisrcdir\)\///g; + # this one doesn't exist? + $s =~ s/LDAP_ENCODE//g; + + # these need to use the library names + $s =~ s/LIBLDB/ldb/g; + $s =~ s/LIBTALLOC/talloc/g; + $s =~ s/LIBTEVENT/tevent/g; + return trim(join(' ', split(/\s+/, $s))); } -- cgit