summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-05-04 10:30:39 +0200
committerAndrew Tridgell <tridge@samba.org>2010-05-04 11:45:43 +0200
commit6eb839cd1695ce8da991c19611210eefda902c0f (patch)
tree618cf174d9219a2a25cf3fb1f99c295c4b3446a1
parent7281b021814379b9c477b42bcf1f2215014d88ae (diff)
downloadsamba-6eb839cd1695ce8da991c19611210eefda902c0f.tar.gz
samba-6eb839cd1695ce8da991c19611210eefda902c0f.tar.bz2
samba-6eb839cd1695ce8da991c19611210eefda902c0f.zip
s4-script: added a --waf option to minimal_includes.pl
This takes advantage of the new waf target syntax
-rwxr-xr-xsource4/script/minimal_includes.pl7
1 files changed, 7 insertions, 0 deletions
diff --git a/source4/script/minimal_includes.pl b/source4/script/minimal_includes.pl
index 990ff00025..4203d00ac0 100755
--- a/source4/script/minimal_includes.pl
+++ b/source4/script/minimal_includes.pl
@@ -11,6 +11,7 @@ use Getopt::Long;
my $opt_help = 0;
my $opt_remove = 0;
my $opt_skip_system = 0;
+my $opt_waf = 0;
#####################################################################
# write a string into a file
@@ -43,6 +44,10 @@ sub test_compile($)
{
my $fname = shift;
my $obj;
+ if ($opt_waf) {
+ my $ret = `../buildtools/bin/waf $fname 2>&1`;
+ return $ret
+ }
if ($fname =~ s/(.*)\..*$/$1.o/) {
$obj = "$1.o";
} else {
@@ -142,6 +147,7 @@ sub ShowHelp()
--help show help
--remove remove includes, don't just list them
--skip-system don't remove system/ includes
+ --waf use waf target conventions
";
}
@@ -151,6 +157,7 @@ GetOptions (
'h|help|?' => \$opt_help,
'remove' => \$opt_remove,
'skip-system' => \$opt_skip_system,
+ 'waf' => \$opt_waf,
);
if ($opt_help) {