зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1335527: Backed out changeset 6306054ca94a for bustage; r=bustage
This commit is contained in:
Aaron Klotz
Родитель
8a75961a58
Коммит
8af3455468
|
|
@ -5,11 +5,10 @@
|
|||
GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
|
||||
|
||||
MIDL_GENERATED_FILES = \
|
||||
IGeckoCustom.h \
|
||||
IGeckoCustom_p.c \
|
||||
IGeckoCustom_i.c \
|
||||
IGeckoCustom.tlb \
|
||||
$(NULL)
|
||||
IGeckoCustom.h \
|
||||
IGeckoCustom_p.c \
|
||||
IGeckoCustom_i.c \
|
||||
$(NULL)
|
||||
|
||||
$(MIDL_GENERATED_FILES): done_gen
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,7 @@ SOURCES += [
|
|||
]
|
||||
|
||||
GENERATED_FILES += [
|
||||
'dlldata.c',
|
||||
'IGeckoCustom.h',
|
||||
'IGeckoCustom.tlb',
|
||||
'IGeckoCustom_i.c',
|
||||
'IGeckoCustom_p.c',
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
|
|
|||
|
|
@ -53,11 +53,10 @@ 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_LIBRARIES:%.idl=%.tlb) \
|
||||
$(MIDL_ENUMS:%.idl=%.h) \
|
||||
$(NULL)
|
||||
|
||||
# We want to generate a .tlb from MIDL_LIBRARIES, but midl also generates
|
||||
|
|
@ -81,8 +80,8 @@ export:: midl
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# generate list of to-be-generated files that are missing
|
||||
# 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))))
|
||||
# but ignore special file dlldata.c
|
||||
missing:=$(strip $(foreach onefile,$(strip $(subst dlldata.c,,$(MIDL_GENERATED_FILES))),$(if $(wildcard $(onefile)),,$(onefile))))
|
||||
|
||||
missing_base:=$(sort $(basename $(subst _p.c,,$(subst _i.c,,$(missing)))))
|
||||
|
||||
|
|
@ -100,9 +99,9 @@ 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 : $(addprefix $(srcdir)/,$(MIDL_LIBRARIES))
|
||||
typelib_done : $(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; \
|
||||
$(MIDL) $(MIDL_FLAGS) -app_config -I $(IA2DIR) -D _MIDL_DECLARE_WIREM_HANDLE -dlldata `basename $$idl .idl`.c -Oicf $$idl; \
|
||||
done
|
||||
touch $@
|
||||
|
||||
|
|
|
|||
|
|
@ -19,68 +19,6 @@ 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',
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -5,17 +5,16 @@
|
|||
GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
|
||||
|
||||
MIDL_GENERATED_FILES = \
|
||||
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)
|
||||
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)
|
||||
|
||||
$(MIDL_GENERATED_FILES): done_gen
|
||||
|
||||
|
|
|
|||
|
|
@ -27,17 +27,7 @@ OS_LIBS += [
|
|||
]
|
||||
|
||||
GENERATED_FILES += [
|
||||
'dlldata.c',
|
||||
'ISimpleDOMDocument.h',
|
||||
'ISimpleDOMDocument_i.c',
|
||||
'ISimpleDOMDocument_p.c',
|
||||
'ISimpleDOMNode.h',
|
||||
'ISimpleDOMNode.tlb',
|
||||
'ISimpleDOMNode_i.c',
|
||||
'ISimpleDOMNode_p.c',
|
||||
'ISimpleDOMText.h',
|
||||
'ISimpleDOMText_i.c',
|
||||
'ISimpleDOMText_p.c',
|
||||
]
|
||||
|
||||
RCINCLUDE = 'AccessibleMarshal.rc'
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче