Bug 1335527: Fix missing entries for .tlb files generated by midl in a11y code; r?mshal
MozReview-Commit-ID: EjvzTvADV1a
--- a/accessible/interfaces/gecko/Makefile.in
+++ b/accessible/interfaces/gecko/Makefile.in
@@ -1,19 +1,20 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
MIDL_GENERATED_FILES = \
- IGeckoCustom.h \
- IGeckoCustom_p.c \
- IGeckoCustom_i.c \
- $(NULL)
+ IGeckoCustom.h \
+ IGeckoCustom_p.c \
+ IGeckoCustom_i.c \
+ IGeckoCustom.tlb \
+ $(NULL)
$(MIDL_GENERATED_FILES): done_gen
done_gen: IGeckoCustom.idl
$(MIDL) $(MIDL_FLAGS) -I $(srcdir) -Oicf $(srcdir)/IGeckoCustom.idl
touch $@
export:: done_gen
--- a/accessible/interfaces/ia2/Makefile.in
+++ b/accessible/interfaces/ia2/Makefile.in
@@ -48,20 +48,21 @@ MIDL_LIBRARIES = \
CSRCS = \
dlldata.c \
$(MIDL_INTERFACES:%.idl=%_p.c) \
$(MIDL_INTERFACES:%.idl=%_i.c) \
$(NULL)
MIDL_GENERATED_FILES = \
dlldata.c \
+ $(MIDL_ENUMS:%.idl=%.h) \
$(MIDL_INTERFACES:%.idl=%_p.c) \
$(MIDL_INTERFACES:%.idl=%_i.c) \
$(MIDL_INTERFACES:%.idl=%.h) \
- $(MIDL_ENUMS:%.idl=%.h) \
+ $(MIDL_LIBRARIES:%.idl=%.tlb) \
$(NULL)
# We want to generate a .tlb from MIDL_LIBRARIES, but midl also generates
# a bunch of .h and .c files that we're not interested in.
MIDL_UNUSED_GENERATED_FILES = \
$(MIDL_LIBRARIES:%.idl=%_p.c) \
$(MIDL_LIBRARIES:%.idl=%_i.c) \
$(MIDL_LIBRARIES:%.idl=%.h) \
--- a/accessible/interfaces/msaa/Makefile.in
+++ b/accessible/interfaces/msaa/Makefile.in
@@ -1,25 +1,26 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
MIDL_GENERATED_FILES = \
- ISimpleDOMNode.h \
- ISimpleDOMNode_p.c \
- ISimpleDOMNode_i.c \
- ISimpleDOMDocument.h \
- ISimpleDOMDocument_p.c \
- ISimpleDOMDocument_i.c \
- ISimpleDOMText.h \
- ISimpleDOMText_p.c \
- ISimpleDOMText_i.c \
- $(NULL)
+ ISimpleDOMNode.h \
+ ISimpleDOMNode_p.c \
+ ISimpleDOMNode_i.c \
+ ISimpleDOMNode.tlb \
+ ISimpleDOMDocument.h \
+ ISimpleDOMDocument_p.c \
+ ISimpleDOMDocument_i.c \
+ ISimpleDOMText.h \
+ ISimpleDOMText_p.c \
+ ISimpleDOMText_i.c \
+ $(NULL)
$(MIDL_GENERATED_FILES): done_gen
done_gen: ISimpleDOMNode.idl \
ISimpleDOMDocument.idl \
ISimpleDOMText.idl
$(MIDL) $(MIDL_FLAGS) -I $(srcdir) -Oicf $(srcdir)/ISimpleDOMNode.idl