Alexandre Julliard : make_makefiles:
Ignore IDL_H_SRCS targets in all directories.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 23 06:18:43 CST 2007
Module: wine
Branch: master
Commit: 8c8751110934c39f2e47af885e302058bde8e613
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8751110934c39f2e47af885e302058bde8e613
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jan 23 12:17:42 2007 +0100
make_makefiles: Ignore IDL_H_SRCS targets in all directories.
---
tools/make_makefiles | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 84c8cc2..1064bef 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -89,6 +89,7 @@ my @ignore_srcs = (
[ 'RC_SRCS', '\.rc', '.res' ],
[ 'RC_SRCS16', '\.rc', '.res' ],
[ 'IDL_TLB_SRCS', '\.idl', '.tlb' ],
+ [ 'IDL_H_SRCS', '\.idl', '.h' ],
[ 'IDL_C_SRCS', '\.idl', '_c.c' ],
[ 'IDL_I_SRCS', '\.idl', '_i.c' ],
[ 'IDL_P_SRCS', '\.idl', '_p.c' ],
@@ -101,7 +102,7 @@ my (@makefiles, %makefiles);
sub update_file($)
{
my $file = shift;
- my $ret = system "cmp $file $file.new >/dev/null";
+ my $ret = !(-f $file) || system "cmp $file $file.new >/dev/null";
if (!$ret)
{
unlink "$file.new";
@@ -317,8 +318,10 @@ sub update_ignores(@)
push @list, map { (my $ret = $_) =~ s/$pattern[1]$/$pattern[2]/; $ret; } @{$makefile{$pattern[0]}};
}
push @list, @{$makefile{"RC_BINARIES"}} if defined $makefile{"RC_BINARIES"};
-
- push @ignores, map { $makefile{"=dir"} . $_; } @list;
+ foreach my $f (@list)
+ {
+ push @ignores, $makefile{"=dir"} . $f unless $f =~ /\$\(.*\)/; # skip make variables
+ }
}
return @ignores;
}
@@ -382,11 +385,6 @@ sub update_dlls(@)
my @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @{$makefile{"SPEC_SRCS16"}};
$altnames{$module} = \@list;
}
-
- if (defined $makefile{"IDL_H_SRCS"})
- {
- push @ignores, map { $_ =~ s/(.*)\.idl$/dlls\/$dir\/$1.h/; $_; } @{$makefile{"IDL_H_SRCS"}};
- }
}
# output special dlls configure definitions
More information about the wine-cvs
mailing list