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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 365a463b1ee402a4efb91f704e3f4c1906ec530f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=365a463b1ee402a4efb91f704e...

Author: Alexandre Julliard 
Date:   Sun Dec 24 17:31:52 2006 +0100

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

---

dlls/.gitignore        |    3 +++
 dlls/atl/.gitignore    |    1 -
 dlls/mshtml/.gitignore |    1 -
 dlls/ole32/.gitignore  |    1 -
 tools/make_makefiles   |   21 ++++++++++++++++-----
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/dlls/.gitignore b/dlls/.gitignore
index 5ed75aa..8a6627c 100644
--- a/dlls/.gitignore
+++ b/dlls/.gitignore
@@ -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
diff --git a/dlls/atl/.gitignore b/dlls/atl/.gitignore
deleted file mode 100644
index 700b45e..0000000
--- a/dlls/atl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/atliface.h
diff --git a/dlls/mshtml/.gitignore b/dlls/mshtml/.gitignore
deleted file mode 100644
index cfac8eb..0000000
--- a/dlls/mshtml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/nsiface.h
diff --git a/dlls/ole32/.gitignore b/dlls/ole32/.gitignore
deleted file mode 100644
index 7a5ae85..0000000
--- a/dlls/ole32/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/dcom.h
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 2a52f19..1fbd104 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -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