From f8421142e7bd5cd26a5bf4b97dc9f9eef49154b4 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 5 Nov 2013 16:33:51 +0100 Subject: [PATCH] makefiles: Add makedep pragmas for typelib idl files. --- Make.rules.in | 2 +- dlls/gameux/gameux_tlb.idl | 2 ++ dlls/hhctrl.ocx/hhctrl_tlb.idl | 2 ++ dlls/hnetcfg/hnetcfg_tlb.idl | 2 ++ dlls/ieframe/ieframe_v1.idl | 2 ++ dlls/jscript/jsglobal.idl | 2 ++ dlls/mmcndmgr/mmcndmgr.idl | 2 ++ dlls/mshtml.tlb/mshtml_tlb.idl | 2 ++ dlls/mshtml/tests/test_tlb.idl | 2 ++ dlls/msi/msiserver.idl | 1 + dlls/msxml/msxml_tlb.idl | 2 ++ dlls/msxml2/msxml2_tlb.idl | 2 ++ dlls/msxml3/msxml3_v1.idl | 2 ++ dlls/msxml4/msxml4_tlb.idl | 2 ++ dlls/msxml6/msxml6_tlb.idl | 2 ++ dlls/oleacc/oleacc_classes.idl | 3 +++ dlls/oleaut32/tests/test_reg.idl | 1 + dlls/oleaut32/tests/test_tlb.idl | 2 ++ dlls/oleaut32/tests/tmarshal.idl | 1 + dlls/oledb32/oledb32_typelib.idl | 3 +++ dlls/pstorec/pstorec_tlb.idl | 2 ++ dlls/quartz/control_tlb.idl | 2 ++ dlls/scrrun/scrrun.idl | 3 +++ dlls/shdocvw/shdocvw_v1.idl | 2 ++ dlls/shell32/shell32_tlb.idl | 2 ++ dlls/stdole2.tlb/std_ole_v2.idl | 2 ++ dlls/stdole32.tlb/std_ole_v1.idl | 2 ++ dlls/vbscript/vbsglobal.idl | 2 ++ dlls/vbscript/vbsregexp10.idl | 2 ++ dlls/vbscript/vbsregexp55.idl | 2 ++ dlls/wbemdisp/wbemdisp_tlb.idl | 2 ++ dlls/winhttp/winhttp_tlb.idl | 2 ++ dlls/wshom.ocx/wshom.idl | 2 ++ dlls/wuapi/wuapi_tlb.idl | 2 ++ include/stdole2.idl | 2 ++ programs/wscript/ihost.idl | 2 ++ 36 files changed, 71 insertions(+), 1 deletion(-) diff --git a/Make.rules.in b/Make.rules.in index 1bba206f932..78503d861b5 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -101,7 +101,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ - $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy diff --git a/dlls/gameux/gameux_tlb.idl b/dlls/gameux/gameux_tlb.idl index 8b18ca09378..06157a1304f 100644 --- a/dlls/gameux/gameux_tlb.idl +++ b/dlls/gameux/gameux_tlb.idl @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "gameux.idl" diff --git a/dlls/hhctrl.ocx/hhctrl_tlb.idl b/dlls/hhctrl.ocx/hhctrl_tlb.idl index c2f8a242b6b..844a68c2899 100644 --- a/dlls/hhctrl.ocx/hhctrl_tlb.idl +++ b/dlls/hhctrl.ocx/hhctrl_tlb.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; diff --git a/dlls/hnetcfg/hnetcfg_tlb.idl b/dlls/hnetcfg/hnetcfg_tlb.idl index 6a202b2de9e..6fb06cb7b9f 100644 --- a/dlls/hnetcfg/hnetcfg_tlb.idl +++ b/dlls/hnetcfg/hnetcfg_tlb.idl @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "netfw.idl" diff --git a/dlls/ieframe/ieframe_v1.idl b/dlls/ieframe/ieframe_v1.idl index a7d3543e4ef..bd396bc8575 100644 --- a/dlls/ieframe/ieframe_v1.idl +++ b/dlls/ieframe/ieframe_v1.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "exdisp.idl" [ diff --git a/dlls/jscript/jsglobal.idl b/dlls/jscript/jsglobal.idl index bd91a6066fa..ac295684f50 100644 --- a/dlls/jscript/jsglobal.idl +++ b/dlls/jscript/jsglobal.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "jsglobal_dispid.h" import "oaidl.idl"; diff --git a/dlls/mmcndmgr/mmcndmgr.idl b/dlls/mmcndmgr/mmcndmgr.idl index bba1d72f29c..3aa698fac2c 100644 --- a/dlls/mmcndmgr/mmcndmgr.idl +++ b/dlls/mmcndmgr/mmcndmgr.idl @@ -17,4 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "mmc.idl" diff --git a/dlls/mshtml.tlb/mshtml_tlb.idl b/dlls/mshtml.tlb/mshtml_tlb.idl index 371cdaf9b0f..faed415106d 100644 --- a/dlls/mshtml.tlb/mshtml_tlb.idl +++ b/dlls/mshtml.tlb/mshtml_tlb.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "mshtml.idl" diff --git a/dlls/mshtml/tests/test_tlb.idl b/dlls/mshtml/tests/test_tlb.idl index 362b7b401cd..34964cba51b 100644 --- a/dlls/mshtml/tests/test_tlb.idl +++ b/dlls/mshtml/tests/test_tlb.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + import "oaidl.idl"; [ diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index d431db9e917..e38fe541c03 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -18,6 +18,7 @@ */ #pragma makedep ident +#pragma makedep typelib #include "msiserver_dispids.h" import "unknwn.idl"; diff --git a/dlls/msxml/msxml_tlb.idl b/dlls/msxml/msxml_tlb.idl index 8ad22a2fc71..09ce4299514 100644 --- a/dlls/msxml/msxml_tlb.idl +++ b/dlls/msxml/msxml_tlb.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "msxml.idl" diff --git a/dlls/msxml2/msxml2_tlb.idl b/dlls/msxml2/msxml2_tlb.idl index 9826496d25e..07b80db28f5 100644 --- a/dlls/msxml2/msxml2_tlb.idl +++ b/dlls/msxml2/msxml2_tlb.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include #include diff --git a/dlls/msxml3/msxml3_v1.idl b/dlls/msxml3/msxml3_v1.idl index d80833fafb6..534e11a3e2b 100644 --- a/dlls/msxml3/msxml3_v1.idl +++ b/dlls/msxml3/msxml3_v1.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "msxml2.idl" diff --git a/dlls/msxml4/msxml4_tlb.idl b/dlls/msxml4/msxml4_tlb.idl index 4f6b4de64d2..7da7774f09a 100644 --- a/dlls/msxml4/msxml4_tlb.idl +++ b/dlls/msxml4/msxml4_tlb.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include #include diff --git a/dlls/msxml6/msxml6_tlb.idl b/dlls/msxml6/msxml6_tlb.idl index 1a2ddbd462d..db4b3e99076 100644 --- a/dlls/msxml6/msxml6_tlb.idl +++ b/dlls/msxml6/msxml6_tlb.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "msxml6.idl" diff --git a/dlls/oleacc/oleacc_classes.idl b/dlls/oleacc/oleacc_classes.idl index 28cb93e319b..8896090de81 100644 --- a/dlls/oleacc/oleacc_classes.idl +++ b/dlls/oleacc/oleacc_classes.idl @@ -15,4 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep typelib + #include "oleacc.idl" diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index 54d492f49a9..385ac600715 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -19,6 +19,7 @@ */ #pragma makedep ident +#pragma makedep typelib import "oaidl.idl"; /* needed by widl */ diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index 91b6a7680af..3492198b1e6 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + import "oaidl.idl"; /* needed by widl */ [uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784)] diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 48801dc1f69..bf90384af95 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -18,6 +18,7 @@ */ #pragma makedep ident +#pragma makedep typelib #include "tmarshal_dispids.h" import "ocidl.idl"; diff --git a/dlls/oledb32/oledb32_typelib.idl b/dlls/oledb32/oledb32_typelib.idl index e47ab8e4a76..89063ef018c 100644 --- a/dlls/oledb32/oledb32_typelib.idl +++ b/dlls/oledb32/oledb32_typelib.idl @@ -17,4 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep typelib + #include "msdasc.idl" diff --git a/dlls/pstorec/pstorec_tlb.idl b/dlls/pstorec/pstorec_tlb.idl index dff2e9fcb3b..22bf2831398 100644 --- a/dlls/pstorec/pstorec_tlb.idl +++ b/dlls/pstorec/pstorec_tlb.idl @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "pstore.idl" diff --git a/dlls/quartz/control_tlb.idl b/dlls/quartz/control_tlb.idl index 6d1855252a7..99924d3da73 100644 --- a/dlls/quartz/control_tlb.idl +++ b/dlls/quartz/control_tlb.idl @@ -14,4 +14,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "control.idl" diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 4b18af140d7..9042d2d0d81 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep typelib + import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; diff --git a/dlls/shdocvw/shdocvw_v1.idl b/dlls/shdocvw/shdocvw_v1.idl index 45b91115497..0d439ae8fb2 100644 --- a/dlls/shdocvw/shdocvw_v1.idl +++ b/dlls/shdocvw/shdocvw_v1.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "exdisp.idl" diff --git a/dlls/shell32/shell32_tlb.idl b/dlls/shell32/shell32_tlb.idl index 2b6c7192d54..f471899b6bd 100644 --- a/dlls/shell32/shell32_tlb.idl +++ b/dlls/shell32/shell32_tlb.idl @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "shldisp.idl" diff --git a/dlls/stdole2.tlb/std_ole_v2.idl b/dlls/stdole2.tlb/std_ole_v2.idl index e2700a62aec..9dbaf6d2e4d 100644 --- a/dlls/stdole2.tlb/std_ole_v2.idl +++ b/dlls/stdole2.tlb/std_ole_v2.idl @@ -18,4 +18,6 @@ * */ +#pragma makedep typelib + #include "stdole2.idl" diff --git a/dlls/stdole32.tlb/std_ole_v1.idl b/dlls/stdole32.tlb/std_ole_v1.idl index 45fb3d50aed..11147503549 100644 --- a/dlls/stdole32.tlb/std_ole_v1.idl +++ b/dlls/stdole32.tlb/std_ole_v1.idl @@ -18,6 +18,8 @@ * */ +#pragma makedep typelib + [ uuid(00020430-0000-0000-C000-000000000046), restricted, diff --git a/dlls/vbscript/vbsglobal.idl b/dlls/vbscript/vbsglobal.idl index fb847c1b70d..e8d8718dbb1 100644 --- a/dlls/vbscript/vbsglobal.idl +++ b/dlls/vbscript/vbsglobal.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + import "oaidl.idl"; #include "vbscript_defs.h" diff --git a/dlls/vbscript/vbsregexp10.idl b/dlls/vbscript/vbsregexp10.idl index 0eb28fa6702..78b2c4b8871 100644 --- a/dlls/vbscript/vbsregexp10.idl +++ b/dlls/vbscript/vbsregexp10.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + import "oaidl.idl"; #include "vbscript_defs.h" diff --git a/dlls/vbscript/vbsregexp55.idl b/dlls/vbscript/vbsregexp55.idl index c0cf68375ec..de2919d14fa 100644 --- a/dlls/vbscript/vbsregexp55.idl +++ b/dlls/vbscript/vbsregexp55.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + import "oaidl.idl"; #include "vbscript_defs.h" diff --git a/dlls/wbemdisp/wbemdisp_tlb.idl b/dlls/wbemdisp/wbemdisp_tlb.idl index f42f7b4cbd9..610aa34e7e1 100644 --- a/dlls/wbemdisp/wbemdisp_tlb.idl +++ b/dlls/wbemdisp/wbemdisp_tlb.idl @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "wbemdisp.idl" diff --git a/dlls/winhttp/winhttp_tlb.idl b/dlls/winhttp/winhttp_tlb.idl index 74beb57e31e..1a7bba1e368 100644 --- a/dlls/winhttp/winhttp_tlb.idl +++ b/dlls/winhttp/winhttp_tlb.idl @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "httprequest.idl" diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index a89b3fcb8aa..cc470e5af02 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + import "oaidl.idl"; cpp_quote("#undef ExpandEnvironmentStrings") diff --git a/dlls/wuapi/wuapi_tlb.idl b/dlls/wuapi/wuapi_tlb.idl index 120e36402c3..98f37908b25 100644 --- a/dlls/wuapi/wuapi_tlb.idl +++ b/dlls/wuapi/wuapi_tlb.idl @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "wuapi.idl" diff --git a/include/stdole2.idl b/include/stdole2.idl index 0aa52c8be34..9537fd3006b 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -18,6 +18,8 @@ * */ +#pragma makedep typelib + [ uuid(00020430-0000-0000-C000-000000000046), version(2.0), diff --git a/programs/wscript/ihost.idl b/programs/wscript/ihost.idl index ccfa173efbf..9e4202ea039 100644 --- a/programs/wscript/ihost.idl +++ b/programs/wscript/ihost.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep typelib + #include "ihost_dispid.h" import "oaidl.idl";