Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 883284 - Part b: Move LIBXUL_LIBRARY into moz.build (a-c); r=joey
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ms2ger
Ms2ger committed Aug 22, 2013
1 parent 1ed86f1 commit 0995057
Show file tree
Hide file tree
Showing 100 changed files with 105 additions and 116 deletions.
2 changes: 0 additions & 2 deletions accessible/src/atk/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = ..
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

ifdef MOZ_ENABLE_GTK
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/atk/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'accessibility_toolkit_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions accessible/src/base/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES += \
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/base/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,5 @@ if a11y_log:

LIBRARY_NAME = 'accessibility_base_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions accessible/src/generic/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES = \
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/generic/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'accessibility_generic_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions accessible/src/html/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES = \
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/html/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'accessibility_html_s'

LIBXUL_LIBRARY = True

3 changes: 0 additions & 3 deletions accessible/src/mac/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = ..
LIBXUL_LIBRARY = 1


include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES += \
Expand Down
3 changes: 3 additions & 0 deletions accessible/src/mac/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ CMMSRCS += [
'mozHTMLAccessible.mm',
'mozTextAccessible.mm',
]

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions accessible/src/other/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = ..
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES += \
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/other/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'accessibility_toolkit_s'

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion accessible/src/windows/ia2/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = accessibility_toolkit_ia2_s
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

# The midl generated code include Windows headers which defines min and max
# macros which conflicts with std::min/max. Suppress the macros:
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/windows/ia2/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ CPP_SOURCES += [
'ia2AccessibleValue.cpp',
]

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions accessible/src/windows/msaa/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = accessibility_toolkit_msaa_s
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

Expand Down
3 changes: 3 additions & 0 deletions accessible/src/windows/msaa/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ if CONFIG['MOZ_XUL']:
'XULMenuAccessibleWrap.cpp',
'XULTreeGridAccessibleWrap.cpp',
]

LIBXUL_LIBRARY = True

2 changes: 1 addition & 1 deletion accessible/src/windows/sdn/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = accessibility_toolkit_sdn_s
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

# The midl generated code include Windows headers which defines min and max
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/windows/sdn/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ CPP_SOURCES += [
'sdnTextAccessible.cpp',
]

LIBXUL_LIBRARY = True

2 changes: 1 addition & 1 deletion accessible/src/windows/uia/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = accessibility_toolkit_uia_s
EXPORT_LIBRARY = ..
LIBXUL_LIBRARY = 1

# The midl generated code include Windows headers which defines min and max
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/windows/uia/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ CPP_SOURCES += [
'uiaRawElmProvider.cpp',
]

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions accessible/src/xpcom/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

EXTRA_MDDEPEND_FILES = xpcAccEvents.pp

include $(topsrcdir)/config/rules.mk
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/xpcom/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'accessibility_xpcom_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions accessible/src/xul/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES = \
Expand Down
2 changes: 2 additions & 0 deletions accessible/src/xul/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'accessibility_xul_s'

LIBXUL_LIBRARY = True

3 changes: 0 additions & 3 deletions caps/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1


include $(topsrcdir)/config/rules.mk

INCLUDES += -I$(srcdir)/../include \
Expand Down
2 changes: 2 additions & 0 deletions caps/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'caps_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions chrome/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = chrome_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

Expand Down
2 changes: 2 additions & 0 deletions chrome/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ CPP_SOURCES += [
'nsChromeRegistryContent.cpp',
]

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion content/base/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkconbase_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
ifdef MOZ_WEBRTC
LOCAL_INCLUDES += \
-I$(topsrcdir)/netwerk/sctp/datachannel \
Expand Down
2 changes: 2 additions & 0 deletions content/base/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,5 @@ EXTRA_JS_MODULES += [

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion content/canvas/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkconcvs_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
ifdef MOZ_WEBGL
LOCAL_INCLUDES += \
-I$(topsrcdir)/js/xpconnect/wrappers \
Expand Down
2 changes: 2 additions & 0 deletions content/canvas/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,5 @@ else:

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion content/events/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkconevents_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

Expand Down
2 changes: 2 additions & 0 deletions content/events/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ if CONFIG['MOZ_WEBSPEECH']:

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion content/html/content/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkconhtmlcon_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

Expand Down
2 changes: 2 additions & 0 deletions content/html/content/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,5 @@ CPP_SOURCES += [

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion content/html/document/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES += \
Expand Down
2 changes: 2 additions & 0 deletions content/html/document/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ LIBRARY_NAME = 'gkconhtmldoc_s'

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion content/mathml/content/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkcontentmathml_s
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

Expand Down
2 changes: 2 additions & 0 deletions content/mathml/content/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ CPP_SOURCES += [

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion content/media/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkconmedia_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

Expand Down
2 changes: 0 additions & 2 deletions content/media/dash/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ VPATH := @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY := 1

include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES := \
Expand Down
2 changes: 2 additions & 0 deletions content/media/dash/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'gkcondash_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions content/media/directshow/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkcondirectshow_s
LIBXUL_LIBRARY = 1

LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/

ifeq ($(OS_ARCH),WINNT)
Expand Down
2 changes: 2 additions & 0 deletions content/media/directshow/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']:

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

13 changes: 0 additions & 13 deletions content/media/encoder/Makefile.in
View file

This file was deleted.

2 changes: 2 additions & 0 deletions content/media/encoder/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconencoder_s'

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions content/media/gstreamer/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

CFLAGS += $(GSTREAMER_CFLAGS)
Expand Down
2 changes: 2 additions & 0 deletions content/media/gstreamer/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkcongstreamer_s'

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions content/media/mediasource/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = gkconmediasource_s
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
2 changes: 2 additions & 0 deletions content/media/mediasource/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ CPP_SOURCES += [

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

4 changes: 3 additions & 1 deletion content/media/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ CPP_SOURCES += [

FAIL_ON_WARNINGS = True


if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
CPP_SOURCES += [
'AudioNodeEngineNEON.cpp',
]

LIBXUL_LIBRARY = True

Loading

0 comments on commit 0995057

Please sign in to comment.