Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit df7deac

Browse files
mshalmshal
committed
Bug 846634 - Part 2: Move EXPORTS to moz.build; r=joey
1 parent 6c20d93 commit df7deac

509 files changed

Lines changed: 3133 additions & 3213 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎accessible/public/Makefile.in‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,5 @@ VPATH = @srcdir@
1111
include $(DEPTH)/config/autoconf.mk
1212

1313

14-
EXPORTS = \
15-
nsIAccessibilityService.h \
16-
$(NULL)
17-
1814
include $(topsrcdir)/config/rules.mk
1915

‎accessible/public/ia2/Makefile.in‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ FORCE_SHARED_LIB = 1
2222

2323
SRCS_IN_OBJDIR = 1
2424

25+
# Please keep this list in sync with the moz.build file until the rest of this
26+
# Makefile is ported over.
2527
MIDL_INTERFACES = \
2628
Accessible2.idl \
2729
AccessibleAction.idl \
@@ -39,19 +41,15 @@ MIDL_INTERFACES = \
3941
AccessibleValue.idl \
4042
$(NULL)
4143

44+
# Please keep this list in sync with the moz.build file until the rest of this
45+
# Makefile is ported over.
4246
MIDL_ENUMS = \
4347
AccessibleEventId.idl \
4448
AccessibleRole.idl \
4549
AccessibleStates.idl \
4650
IA2CommonTypes.idl \
4751
$(NULL)
4852

49-
EXPORTS = \
50-
$(MIDL_INTERFACES:%.idl=%.h) \
51-
$(MIDL_INTERFACES:%.idl=%_i.c) \
52-
$(MIDL_ENUMS:%.idl=%.h) \
53-
$(NULL)
54-
5553
CSRCS = \
5654
dlldata.c \
5755
$(MIDL_INTERFACES:%.idl=%_p.c) \

‎accessible/public/ia2/moz.build‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,34 @@
66

77
MODULE = 'accessibility'
88

9+
# Please keep this list in sync with the Makefile.in until the rest of that file
10+
# is ported over.
11+
midl_interfaces = [
12+
'Accessible2',
13+
'AccessibleAction',
14+
'AccessibleApplication',
15+
'AccessibleComponent',
16+
'AccessibleEditableText',
17+
'AccessibleHyperlink',
18+
'AccessibleHypertext',
19+
'AccessibleImage',
20+
'AccessibleRelation',
21+
'AccessibleTable',
22+
'AccessibleTable2',
23+
'AccessibleTableCell',
24+
'AccessibleText',
25+
'AccessibleValue',
26+
]
27+
28+
# Please keep this list in sync with the Makefile.in until the rest of that file
29+
# is ported over.
30+
midl_enums = [
31+
'AccessibleEventId',
32+
'AccessibleRole',
33+
'AccessibleStates',
34+
'IA2CommonTypes',
35+
]
36+
37+
EXPORTS += [x + '.h' for x in midl_enums]
38+
EXPORTS += [x + '.h' for x in midl_interfaces]
39+
EXPORTS += [x + '_i.c' for x in midl_interfaces]

‎accessible/public/moz.build‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ XPIDL_SOURCES += [
3939

4040
MODULE = 'accessibility'
4141

42+
EXPORTS += [
43+
'nsIAccessibilityService.h',
44+
]
45+

‎accessible/public/msaa/Makefile.in‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,6 @@ done_gen: ISimpleDOMNode.idl \
5757
$(MIDL) $(MIDL_FLAGS) -Oicf $(srcdir)/ISimpleDOMText.idl
5858
touch $@
5959

60-
EXPORTS = \
61-
ISimpleDOMNode.h \
62-
ISimpleDOMNode_i.c \
63-
ISimpleDOMDocument.h \
64-
ISimpleDOMDocument_i.c \
65-
ISimpleDOMText.h \
66-
ISimpleDOMText_i.c \
67-
$(NULL)
68-
6960
export:: done_gen
7061

7162
# This marshall dll is also registered in the installer

‎accessible/public/msaa/moz.build‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@
66

77
MODULE = 'accessibility'
88

9+
EXPORTS += [
10+
'ISimpleDOMDocument.h',
11+
'ISimpleDOMDocument_i.c',
12+
'ISimpleDOMNode.h',
13+
'ISimpleDOMNode_i.c',
14+
'ISimpleDOMText.h',
15+
'ISimpleDOMText_i.c',
16+
]
17+

‎accessible/src/atk/Makefile.in‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@ CPPSRCS = \
3636
UtilInterface.cpp \
3737
$(NULL)
3838

39-
EXPORTS = \
40-
nsAccessNodeWrap.h \
41-
$(NULL)
42-
43-
EXPORTS_NAMESPACES = mozilla/a11y
44-
45-
EXPORTS_mozilla/a11y = \
46-
AccessibleWrap.h \
47-
HyperTextAccessibleWrap.h \
48-
$(null)
49-
5039
# we want to force the creation of a static lib.
5140
FORCE_STATIC_LIB = 1
5241

‎accessible/src/atk/moz.build‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@
66

77
MODULE = 'accessibility'
88

9+
EXPORTS += [
10+
'nsAccessNodeWrap.h',
11+
]
12+
13+
EXPORTS.mozilla.a11y += [
14+
'AccessibleWrap.h',
15+
'HyperTextAccessibleWrap.h',
16+
]
17+

‎accessible/src/base/Makefile.in‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,6 @@ CPPSRCS += \
4646
$(NULL)
4747
endif
4848

49-
EXPORTS = \
50-
AccEvent.h \
51-
nsAccessibilityService.h \
52-
nsAccessNode.h \
53-
$(NULL)
54-
55-
EXPORTS_NAMESPACES = mozilla/a11y
56-
57-
EXPORTS_mozilla/a11y = \
58-
DocManager.h \
59-
FocusManager.h \
60-
AccTypes.h \
61-
Platform.h \
62-
States.h \
63-
SelectionManager.h \
64-
Role.h \
65-
$(NULL)
66-
67-
ifdef MOZ_DEBUG
68-
EXPORTS_mozilla/a11y += \
69-
Logging.h \
70-
$(NULL)
71-
endif
72-
7349
# we don't want the shared lib, but we want to force the creation of a static lib.
7450
FORCE_STATIC_LIB = 1
7551

‎accessible/src/base/moz.build‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,23 @@
66

77
MODULE = 'accessibility'
88

9+
EXPORTS += [
10+
'AccEvent.h',
11+
'nsAccessNode.h',
12+
'nsAccessibilityService.h',
13+
]
14+
15+
EXPORTS.mozilla.a11y += [
16+
'AccTypes.h',
17+
'DocManager.h',
18+
'FocusManager.h',
19+
'Platform.h',
20+
'Role.h',
21+
'SelectionManager.h',
22+
'States.h',
23+
]
24+
25+
if CONFIG['MOZ_DEBUG']:
26+
EXPORTS.mozilla.a11y += [
27+
'Logging.h',
28+
]

0 commit comments

Comments
 (0)