Commit 365a463b authored by Alexandre Julliard's avatar Alexandre Julliard

make_makefiles: Automatically add IDL header targets to the .gitignore file.

parent dff271df
......@@ -57,6 +57,7 @@
activeds/libactiveds.def
advapi32/libadvapi32.def
advpack/libadvpack.def
atl/atliface.h
atl/libatl.def
avicap32/libavicap32.def
avifil32/libavifil32.def
......@@ -107,6 +108,7 @@ msacm32/libmsacm32.def
mscms/libmscms.def
msdmo/libmsdmo.def
mshtml/libmshtml.def
mshtml/nsiface.h
msi/libmsi.def
msimg32/libmsimg32.def
msvcrt/libmsvcrt.def
......@@ -122,6 +124,7 @@ ntdll/libntdll.def
ntdsapi/libntdsapi.def
odbc32/libodbc32.def
odbccp32/libodbccp32.def
ole32/dcom.h
ole32/libole32.def
oleacc/liboleacc.def
oleaut32/liboleaut32.def
......
......@@ -142,11 +142,17 @@ sub parse_makefile($)
$make{"=rules"} = $makerules{$var};
next;
}
if (/^(MODULE|IMPORTLIB|IMPLIB_SRCS|SPEC_SRCS16)\s*=\s*(.*)/)
if (/^(MODULE|IMPORTLIB)\s*=\s*(.*)/)
{
$make{$1} = $2;
next;
}
if (/^(IDL_H_SRCS|IMPLIB_SRCS|SPEC_SRCS16)\s*=\s*(.*)/)
{
my @list = split(/\s+/, $2);
$make{$1} = \@list;
next;
}
if (/^\#\s*MKDLL_SKIP/ || /^\#\s*MKPROG_SKIP/)
{
$make{"=skip"} = 1;
......@@ -294,15 +300,16 @@ sub update_dlls(@)
next unless defined $makefile{"MODULE"};
my $module = $makefile{"MODULE"};
(my $dir = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/;
if ($module =~ /^lib.*\.a$/)
{
($staticlib_dirs{$module} = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/;
$staticlib_dirs{$module} = $dir;
die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module;
}
else
{
($directories{$module} = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/;
$directories{$module} = $dir;
}
if (defined $makefile{"IMPORTLIB"})
......@@ -321,10 +328,14 @@ sub update_dlls(@)
if (defined $makefile{"SPEC_SRCS16"})
{
my @list = split(/\s+/, $makefile{"SPEC_SRCS16"});
@list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @list;
my @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @{$makefile{"SPEC_SRCS16"}};
$altnames{$module} = \@list;
}
if (defined $makefile{"IDL_H_SRCS"})
{
push @ignores, map { $_ =~ s/(.*)\.idl$/$dir\/$1.h/; $_; } @{$makefile{"IDL_H_SRCS"}};
}
}
# output special dlls configure definitions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment