Commit ed3d8d82 authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

merge mozilla-inbound to mozilla-central a=merge

parents bd99f5a4 facbf1c4

accessible/interfaces/gecko/Makefile.in

+7 −5
Original line number Diff line number Diff line
@@ -2,12 +2,14 @@ 
# 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

GARBAGE += $(MIDL_GENERATED_FILES) done_gen



MIDL_GENERATED_FILES = \

  dlldata.c \

  IGeckoCustom.h \

  IGeckoCustom_p.c \

  IGeckoCustom_i.c \

  IGeckoCustom.tlb \

  $(NULL)



$(MIDL_GENERATED_FILES): done_gen

accessible/interfaces/gecko/moz.build

+4 −0
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ SOURCES += [ 
]



GENERATED_FILES += [

    'dlldata.c',

    'IGeckoCustom.h',

    'IGeckoCustom.tlb',

    'IGeckoCustom_i.c',

    'IGeckoCustom_p.c',

]



FINAL_LIBRARY = 'xul'

accessible/interfaces/ia2/Makefile.in

+8 −5
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ IA2DIR = $(topsrcdir)/other-licenses/ia2 


GARBAGE       += $(MIDL_GENERATED_FILES) \

                 $(MIDL_UNUSED_GENERATED_FILES) \

                 midl_done \

                 typelib_done \

                 $(NULL)



# Please keep this list in sync with the moz.build file until the rest of this
@@ -53,10 +55,11 @@ CSRCS = \ 


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
@@ -80,8 +83,8 @@ export:: midl 
include $(topsrcdir)/config/rules.mk



# generate list of to-be-generated files that are missing

# but ignore special file dlldata.c

missing:=$(strip $(foreach onefile,$(strip $(subst dlldata.c,,$(MIDL_GENERATED_FILES))),$(if $(wildcard $(onefile)),,$(onefile))))

# but ignore special file dlldata.c and .tlb files

missing:=$(strip $(foreach onefile,$(strip $(patsubst %.tlb,,$(subst dlldata.c,,$(MIDL_GENERATED_FILES)))),$(if $(wildcard $(onefile)),,$(onefile))))



missing_base:=$(sort $(basename $(subst _p.c,,$(subst _i.c,,$(missing)))))
@@ -99,7 +102,7 @@ midl_done : $(addprefix $(IA2DIR)/,$(MIDL_INTERFACES) $(MIDL_ENUMS)) 


# The intent of this rule is to generate the .tlb file that is referenced in the

# .rc file for IA2Marshal.dll

typelib_done : $(MIDL_LIBRARIES)

typelib_done : $(addprefix $(srcdir)/,$(MIDL_LIBRARIES))

	for idl in $?; do \

	  $(MIDL) $(MIDL_FLAGS) -app_config -I $(IA2DIR) -D _MIDL_DECLARE_WIREM_HANDLE -dlldata `basename $$idl .idl`.c -Oicf $$idl; \

	done

accessible/interfaces/ia2/moz.build

+62 −0
Original line number Diff line number Diff line
@@ -19,6 +19,68 @@ OS_LIBS += [ 
]



GENERATED_FILES += [

    'Accessible2.h',

    'Accessible2_2.h',

    'Accessible2_2_i.c',

    'Accessible2_2_p.c',

    'Accessible2_3.h',

    'Accessible2_3_i.c',

    'Accessible2_3_p.c',

    'Accessible2_i.c',

    'Accessible2_p.c',

    'AccessibleAction.h',

    'AccessibleAction_i.c',

    'AccessibleAction_p.c',

    'AccessibleApplication.h',

    'AccessibleApplication_i.c',

    'AccessibleApplication_p.c',

    'AccessibleComponent.h',

    'AccessibleComponent_i.c',

    'AccessibleComponent_p.c',

    'AccessibleDocument.h',

    'AccessibleDocument_i.c',

    'AccessibleDocument_p.c',

    'AccessibleEditableText.h',

    'AccessibleEditableText_i.c',

    'AccessibleEditableText_p.c',

    'AccessibleEventId.h',

    'AccessibleHyperlink.h',

    'AccessibleHyperlink_i.c',

    'AccessibleHyperlink_p.c',

    'AccessibleHypertext.h',

    'AccessibleHypertext2.h',

    'AccessibleHypertext2_i.c',

    'AccessibleHypertext2_p.c',

    'AccessibleHypertext_i.c',

    'AccessibleHypertext_p.c',

    'AccessibleImage.h',

    'AccessibleImage_i.c',

    'AccessibleImage_p.c',

    'AccessibleRelation.h',

    'AccessibleRelation_i.c',

    'AccessibleRelation_p.c',

    'AccessibleRole.h',

    'AccessibleStates.h',

    'AccessibleTable.h',

    'AccessibleTable2.h',

    'AccessibleTable2_i.c',

    'AccessibleTable2_p.c',

    'AccessibleTable_i.c',

    'AccessibleTable_p.c',

    'AccessibleTableCell.h',

    'AccessibleTableCell_i.c',

    'AccessibleTableCell_p.c',

    'AccessibleText.h',

    'AccessibleText2.h',

    'AccessibleText2_i.c',

    'AccessibleText2_p.c',

    'AccessibleText_i.c',

    'AccessibleText_p.c',

    'AccessibleValue.h',

    'AccessibleValue_i.c',

    'AccessibleValue_p.c',

    'dlldata.c',

    'IA2CommonTypes.h',

    'IA2Typelib.tlb',

]

accessible/interfaces/msaa/Makefile.in

+13 −11
Original line number Diff line number Diff line
@@ -2,12 +2,14 @@ 
# 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

GARBAGE += $(MIDL_GENERATED_FILES) done_gen



MIDL_GENERATED_FILES = \

  dlldata.c \

  ISimpleDOMNode.h \

  ISimpleDOMNode_p.c \

  ISimpleDOMNode_i.c \

  ISimpleDOMNode.tlb \

  ISimpleDOMDocument.h \

  ISimpleDOMDocument_p.c \

  ISimpleDOMDocument_i.c \