Alexandre Julliard : makefiles: Automatically update the IDL_H_SRCS variable.
Alexandre Julliard
julliard at winehq.org
Mon Dec 16 13:02:31 CST 2013
Module: wine
Branch: master
Commit: ca41acc1f943f07e06cc70c69733c36e87fdc83f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca41acc1f943f07e06cc70c69733c36e87fdc83f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Dec 14 11:35:40 2013 +0100
makefiles: Automatically update the IDL_H_SRCS variable.
---
dlls/infosoft/Makefile.in | 1 -
dlls/jscript/Makefile.in | 1 -
dlls/mshtml/tests/Makefile.in | 1 -
dlls/msi/Makefile.in | 1 -
dlls/msxml3/Makefile.in | 2 --
dlls/scrrun/Makefile.in | 2 --
dlls/vbscript/Makefile.in | 5 -----
dlls/wbemdisp/Makefile.in | 1 -
dlls/wshom.ocx/Makefile.in | 1 -
programs/wscript/Makefile.in | 1 -
tools/make_makefiles | 4 +++-
11 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index f7c1bbf..3acc7c9 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -5,7 +5,6 @@ C_SRCS = \
infosoft_main.c \
wordbreaker.c
-IDL_H_SRCS = infosoft.idl
IDL_R_SRCS = infosoft.idl
@MAKE_DLL_RULES@
diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index cb041b2..9078b04 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -30,7 +30,6 @@ RC_SRCS = jscript.rc
IDL_TLB_SRCS = jsglobal.idl
IDL_R_SRCS = jscript_classes.idl
-IDL_H_SRCS = jscript_classes.idl
BISON_SRCS = \
parser.y
diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in
index e339175..6471156 100644
--- a/dlls/mshtml/tests/Makefile.in
+++ b/dlls/mshtml/tests/Makefile.in
@@ -12,7 +12,6 @@ C_SRCS = \
style.c
IDL_TLB_SRCS = test_tlb.idl
-IDL_H_SRCS = test_tlb.idl
RC_SRCS = rsrc.rc
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index cba9c03..36cf303 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -44,7 +44,6 @@ C_SRCS = \
upgrade.c \
where.c
-IDL_H_SRCS = msiserver.idl
IDL_I_SRCS = msiserver.idl
IDL_R_SRCS = msiserver.idl
IDL_TLB_SRCS = msiserver.idl
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 1e056cf..ed4c039 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -47,8 +47,6 @@ RC_SRCS = \
IDL_R_SRCS = xmlparser.idl
-IDL_H_SRCS = xmlparser.idl
-
IDL_TLB_SRCS = msxml3_v1.idl
@MAKE_DLL_RULES@
diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in
index cb5d981..362cba7 100644
--- a/dlls/scrrun/Makefile.in
+++ b/dlls/scrrun/Makefile.in
@@ -10,6 +10,4 @@ RC_SRCS = scrrun.rc
IDL_TLB_SRCS = scrrun.idl
-IDL_H_SRCS = scrrun.idl
-
@MAKE_DLL_RULES@
diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in
index 5bc66cf..381dfd1 100644
--- a/dlls/vbscript/Makefile.in
+++ b/dlls/vbscript/Makefile.in
@@ -18,11 +18,6 @@ BISON_SRCS = \
RC_SRCS = vbscript.rc
-IDL_H_SRCS = \
- vbscript_classes.idl \
- vbsglobal.idl \
- vbsregexp55.idl
-
IDL_TLB_SRCS = \
vbsglobal.idl \
vbsregexp10.idl \
diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in
index 3f3ff49..dbd76d9 100644
--- a/dlls/wbemdisp/Makefile.in
+++ b/dlls/wbemdisp/Makefile.in
@@ -6,7 +6,6 @@ C_SRCS = \
main.c
IDL_R_SRCS = wbemdisp_classes.idl
-IDL_H_SRCS = wbemdisp_classes.idl
IDL_TLB_SRCS = wbemdisp_tlb.idl
diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in
index 6635e5d..9d49bde 100644
--- a/dlls/wshom.ocx/Makefile.in
+++ b/dlls/wshom.ocx/Makefile.in
@@ -7,7 +7,6 @@ C_SRCS = \
RC_SRCS = wshom.rc
-IDL_H_SRCS = wshom.idl
IDL_TLB_SRCS = wshom.idl
@MAKE_DLL_RULES@
diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in
index 2f4074e..2e85e35 100644
--- a/programs/wscript/Makefile.in
+++ b/programs/wscript/Makefile.in
@@ -10,7 +10,6 @@ C_SRCS = \
host.c \
main.c
-IDL_H_SRCS = ihost.idl
IDL_TLB_SRCS = ihost.idl
@MAKE_PROG_RULES@
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 6b6cdb9..13106e7 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -485,7 +485,7 @@ sub assign_sources_to_makefiles(@)
{
my %flags = get_makedep_flags( $file );
push @{${$make}{"=IDL_C_SRCS"}}, $name if defined $flags{"client"};
- push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"};
+ push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"} || !(keys %flags);
push @{${$make}{"=IDL_I_SRCS"}}, $name if defined $flags{"ident"};
push @{${$make}{"=IDL_P_SRCS"}}, $name if defined $flags{"proxy"};
push @{${$make}{"=IDL_R_SRCS"}}, $name if defined $flags{"register"};
@@ -510,6 +510,7 @@ sub assign_sources_to_makefiles(@)
unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)";
unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)";
unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)";
+ unshift @{${$make}{"=IDL_H_SRCS"}}, "\$(PUBLIC_IDL_H_SRCS) \$(PRIVATE_IDL_H_SRCS)";
# preserve shared source files from the parent makefile
foreach my $file (@makefiles)
@@ -619,6 +620,7 @@ sub update_makefiles(@)
replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" );
replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" );
replace_makefile_variable( $file, "IDL_C_SRCS" );
+ replace_makefile_variable( $file, "IDL_H_SRCS" );
replace_makefile_variable( $file, "IDL_I_SRCS" );
replace_makefile_variable( $file, "IDL_P_SRCS" );
replace_makefile_variable( $file, "IDL_R_SRCS" );
More information about the wine-cvs
mailing list