build: improve the wscript generator
authorAndrew Tridgell <tridge@samba.org>
Tue, 23 Feb 2010 03:59:47 +0000 (14:59 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 6 Apr 2010 10:26:36 +0000 (20:26 +1000)
buildtools/mktowscript/mklist.txt
buildtools/mktowscript/mktowscript.pl

index 3e0e1a19597048b6773d0c8a9a02861c946c773c..8a9a6c549a43082ed8136617d3ebe56dc0b5d3d8 100644 (file)
@@ -1,4 +1,5 @@
 source4/main.mk
+source4/lib/basic.mk
 pidl/config.mk
 nsswitch/config.mk
 nsswitch/libwbclient/config.mk
index 18c8779055ac66e6407d27fb0b88e3f322c9bc09..5dc4e1b9441dceec687fda525ab618feb08625f1 100755 (executable)
@@ -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)));
 }