diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-23 14:59:47 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:36 +1000 |
| commit | 7e01efa80fc6262bf5558b213fa572f4253316dc (patch) | |
| tree | 87e33c40e2717892aa6451b23ec9f1958501a941 | |
| parent | 9e79e14e1434dc2bf77eba7bfc79d816cd43cd11 (diff) | |
| download | samba-7e01efa80fc6262bf5558b213fa572f4253316dc.tar.gz samba-7e01efa80fc6262bf5558b213fa572f4253316dc.tar.xz samba-7e01efa80fc6262bf5558b213fa572f4253316dc.zip | |
build: improve the wscript generator
| -rw-r--r-- | buildtools/mktowscript/mklist.txt | 1 | ||||
| -rwxr-xr-x | buildtools/mktowscript/mktowscript.pl | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/buildtools/mktowscript/mklist.txt b/buildtools/mktowscript/mklist.txt index 3e0e1a19597..8a9a6c549a4 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 18c8779055a..5dc4e1b9441 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))); } |