makefiles: Add makedep pragmas for typelib idl files.

2013-11-05 16:33:51 +01:00 · 2013-11-05 16:33:51 +01:00 · f8421142e7
parent 7960e02b17
commit f8421142e7
36 changed files with 71 additions and 1 deletions
--- 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
--- 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"
--- 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";
--- 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"
--- 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"

 [
--- 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";
--- 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"
--- 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"
--- 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";

 [
--- 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";
--- 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"
--- 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 <msxml2did.h>
 #include <idispids.h>

--- 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"
--- 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 <msxml2did.h>
 #include <idispids.h>

--- 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"
--- 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"
--- 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 */

--- 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)]
--- 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";
--- 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"
--- 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"
--- 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"
--- 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";
--- 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"
--- 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"
--- 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"
--- 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,
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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")

--- 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"
--- a/include/stdole2.idl
+++ b/include/stdole2.idl
@ -18,6 +18,8 @@
 *
 */

+#pragma makedep typelib
+
 [
  uuid(00020430-0000-0000-C000-000000000046),
  version(2.0),
--- 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";