mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 13:51:41 +00:00
[PATCH] bug 922566 - kill dom-config.mk
From 6681eaa8bb47ddb4756fd71738771c4c437101c0 Mon Sep 17 00:00:00 2001 --- content/media/webspeech/recognition/Makefile.in | 1 - content/media/webspeech/recognition/moz.build | 5 +- content/media/webspeech/synth/Makefile.in | 1 - content/media/webspeech/synth/pico/Makefile.in | 3 -- dom/alarm/Makefile.in | 2 - dom/apps/src/Makefile.in | 1 - dom/base/Makefile.in | 2 - dom/base/moz.build | 26 ++++++++++- dom/battery/Makefile.in | 1 - dom/bindings/Makefile.in | 3 -- dom/bindings/moz.build | 17 ++++++- dom/bindings/test/Makefile.in | 5 +- dom/bluetooth/Makefile.in | 2 - dom/bluetooth/moz.build | 7 ++- dom/browser-element/Makefile.in | 3 -- dom/browser-element/moz.build | 6 ++- dom/camera/Makefile.in | 1 - dom/camera/moz.build | 5 +- dom/devicestorage/Makefile.in | 1 - dom/dom-config.mk | 61 ------------------------- dom/encoding/Makefile.in | 1 - dom/fmradio/Makefile.in | 2 - dom/fmradio/ipc/Makefile.in | 1 - dom/fmradio/ipc/moz.build | 5 +- dom/fmradio/moz.build | 5 +- dom/icc/src/Makefile.in | 4 -- dom/media/Makefile.in | 3 -- dom/media/moz.build | 6 ++- dom/mobilemessage/src/Makefile.in | 1 - dom/mobilemessage/src/moz.build | 5 +- dom/network/src/Makefile.in | 2 - dom/plugins/base/Makefile.in | 1 - dom/plugins/base/moz.build | 8 +++- dom/power/Makefile.in | 1 - dom/quota/Makefile.in | 1 - dom/system/gonk/Makefile.in | 2 - dom/telephony/Makefile.in | 1 - dom/time/Makefile.in | 1 - dom/wifi/Makefile.in | 5 -- 39 files changed, 85 insertions(+), 123 deletions(-) delete mode 100644 dom/dom-config.mk delete mode 100644 dom/wifi/Makefile.in
This commit is contained in:
Trevor Saunders
parent
b2e530f216
commit
f1399b6633
@ -2,5 +2,4 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -44,5 +44,8 @@ LIBXUL_LIBRARY = True
|
||||
|
||||
LIBRARY_NAME = 'gkconwebspeechrecognition_s'
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'/dom/base',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
VPATH += \
|
||||
$(srcdir)/ipc \
|
||||
|
||||
@ -2,7 +2,4 @@
|
||||
# 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/.
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -2,7 +2,5 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -6,5 +6,4 @@ LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/js/xpconnect/wrappers \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -2,8 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
ifdef MOZ_JSDEBUGGER
|
||||
DEFINES += -DMOZ_JSDEBUGGER
|
||||
endif
|
||||
|
||||
@ -125,5 +125,29 @@ MSVC_ENABLE_PGO = True
|
||||
|
||||
LIBRARY_NAME = 'jsdombase_s'
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'../battery',
|
||||
'../bluetooth',
|
||||
'../icc/src',
|
||||
'../media',
|
||||
'../network/src',
|
||||
'../src/geolocation',
|
||||
'../src/storage',
|
||||
'../time',
|
||||
'/content/base/src',
|
||||
'/content/events/src',
|
||||
'/content/html/document/src',
|
||||
'/content/xbl/src',
|
||||
'/content/xul/document/src',
|
||||
'/layout/generic',
|
||||
'/layout/style',
|
||||
'/layout/xul/base/src',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_B2G_RIL']:
|
||||
LOCAL_INCLUDES += [
|
||||
'../fmradio',
|
||||
'../system/gonk',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/content/events/src \
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
# Need this to find all our DOM source files.
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
webidl_base = $(topsrcdir)/dom/webidl
|
||||
# Generated by moz.build
|
||||
include webidlsrcs.mk
|
||||
|
||||
@ -43,5 +43,20 @@ LIBRARY_NAME = 'dombindings_s'
|
||||
|
||||
EXPORT_LIBRARY = True
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'../bluetooth',
|
||||
'../camera',
|
||||
'../file',
|
||||
'../src/geolocation',
|
||||
'../workers',
|
||||
'/content/base/src',
|
||||
'/content/events/src',
|
||||
'/content/html/document/src',
|
||||
'/content/media/webaudio',
|
||||
'/content/svg/content/src',
|
||||
'/content/xbl/src',
|
||||
'/layout/style',
|
||||
'/layout/xul/tree',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -10,10 +10,7 @@ ifdef .PYMAKE
|
||||
.NOTPARALLEL:
|
||||
endif
|
||||
|
||||
# Need this to find all our DOM source files.
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
# And need this for $(test_webidl_files) and $(preprocessed_test_webidl_files)
|
||||
# Need this for $(test_webidl_files)
|
||||
include ../webidlsrcs.mk
|
||||
|
||||
# But the webidl actually lives in our parent dir
|
||||
|
||||
@ -12,8 +12,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
VPATH += $(srcdir)/ipc
|
||||
|
||||
ifneq (,$(MOZ_B2G_BT))
|
||||
|
||||
@ -84,5 +84,10 @@ IPDL_SOURCES += [
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'../base',
|
||||
'../network/src',
|
||||
'../system/gonk',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += \
|
||||
|
||||
@ -34,5 +34,9 @@ LIBXUL_LIBRARY = True
|
||||
|
||||
LIBRARY_NAME = 'dom_browserelement_s'
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'../bluetooth',
|
||||
'/content/html/content/src',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,5 +2,4 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -53,5 +53,8 @@ LIBXUL_LIBRARY = True
|
||||
|
||||
LIBRARY_NAME = 'domcamera_s'
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'../base',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/dom/base \
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
# 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/.
|
||||
|
||||
DOM_SRCDIRS = \
|
||||
dom/base \
|
||||
dom/battery \
|
||||
dom/encoding \
|
||||
dom/file \
|
||||
dom/power \
|
||||
dom/push \
|
||||
dom/quota \
|
||||
dom/media \
|
||||
dom/network/src \
|
||||
dom/phonenumberutils \
|
||||
dom/alarm \
|
||||
dom/src/events \
|
||||
dom/src/storage \
|
||||
dom/src/offline \
|
||||
dom/src/geolocation \
|
||||
dom/src/notification \
|
||||
dom/workers \
|
||||
dom/time \
|
||||
content/xbl/src \
|
||||
content/xul/document/src \
|
||||
content/events/src \
|
||||
content/base/src \
|
||||
content/html/content/src \
|
||||
content/html/document/src \
|
||||
content/media/mediasource \
|
||||
content/media/webaudio \
|
||||
content/svg/content/src \
|
||||
layout/generic \
|
||||
layout/style \
|
||||
layout/xul/base/src \
|
||||
layout/xul/tree \
|
||||
dom/camera \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_B2G_RIL
|
||||
DOM_SRCDIRS += \
|
||||
dom/system/gonk \
|
||||
dom/wifi \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_B2G_FM
|
||||
DOM_SRCDIRS += \
|
||||
dom/fmradio \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_B2G_BT
|
||||
DOM_SRCDIRS += dom/bluetooth
|
||||
endif
|
||||
|
||||
ifdef MOZ_WEBSPEECH
|
||||
DOM_SRCDIRS += content/media/webspeech
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES += $(DOM_SRCDIRS:%=-I$(topsrcdir)/%)
|
||||
@ -6,7 +6,6 @@ LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/intl/locale/src \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h
|
||||
|
||||
@ -2,7 +2,5 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -6,7 +6,6 @@ LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/dom/fmradio \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
@ -23,5 +23,8 @@ FAIL_ON_WARNINGS = True
|
||||
LIBXUL_LIBRARY = True
|
||||
LIBRARY_NAME = 'domfmradio_s'
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'/dom/base',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -33,5 +33,8 @@ IPDL_SOURCES += [
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../base',
|
||||
'../system/gonk',
|
||||
]
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
|
||||
@ -2,10 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
VPATH = $(srcdir)
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/content/events/src \
|
||||
$(NULL)
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
|
||||
ifdef MOZ_WEBRTC
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/media/webrtc/trunk \
|
||||
|
||||
@ -51,5 +51,9 @@ LIBXUL_LIBRARY = True
|
||||
|
||||
LIBRARY_NAME = 'dom_media_s'
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'../base',
|
||||
'../camera',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,5 +2,4 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -82,5 +82,8 @@ MSVC_ENABLE_PGO = True
|
||||
|
||||
LIBRARY_NAME = 'dom_mobilemessage_s'
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'/dom/base',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
# 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/.
|
||||
|
||||
VPATH = $(srcdir)
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/content/events/src \
|
||||
|
||||
@ -22,7 +22,6 @@ LOCAL_INCLUDES += \
|
||||
$(MOZ_PIXMAN_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
|
||||
@ -103,5 +103,11 @@ LIBRARY_NAME = 'gkplugin'
|
||||
|
||||
EXPORT_LIBRARY = True
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
LOCAL_INCLUDES += [
|
||||
'/content/base/src',
|
||||
'/dom/base',
|
||||
'/layout/generic',
|
||||
'/layout/xul/base/src',
|
||||
]
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
@ -2,6 +2,5 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/caps/include \
|
||||
|
||||
@ -12,8 +12,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(topsrcdir)/dom/base \
|
||||
-I$(topsrcdir)/dom/src/geolocation \
|
||||
|
||||
@ -2,5 +2,4 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -2,6 +2,5 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/dom/dom-config.mk
|
||||
Loading…
Reference in New Issue
Block a user