nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1042878 - part 2 - move MOZ_CAIRO_CFLAGS et al additions to C*FLAGS into moz.build; r=glandium

Browse source
This commit is contained in:
Nathan Froyd 2014-07-24 11:55:33 -04:00
parent 2ed4280f6b
commit 12c76f15f7
161 changed files with 288 additions and 724 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
accessible/atk/Makefile.in
View file

@ -1,14 +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)/config/rules.mk
ifdef MOZ_ENABLE_GTK
CFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
endif
ifdef MOZ_ENABLE_DBUS
CXXFLAGS += $(MOZ_DBUS_CFLAGS)
endif

7
accessible/atk/moz.build
View file

@ -41,3 +41,10 @@ LOCAL_INCLUDES += [
] ]
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_ENABLE_GTK']:
CFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_ENABLE_DBUS']:
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']

9
accessible/base/Makefile.in
View file

@ -1,9 +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)/config/rules.mk
ifdef MOZ_ENABLE_GTK
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
endif

3
accessible/base/moz.build
View file

@ -90,3 +90,6 @@ else:
] ]
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_ENABLE_GTK']:
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

11
browser/components/shell/Makefile.in
View file

@ -1,11 +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)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)
clobber::
rm -f $(DIST)/lib/$(LIBRARY_NAME).lib

2
browser/components/shell/moz.build
View file

@ -47,3 +47,5 @@ EXTRA_COMPONENTS += [
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'): for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
DEFINES[var] = '"%s"' % CONFIG[var] DEFINES[var] = '"%s"' % CONFIG[var]
CXXFLAGS += CONFIG['TK_CFLAGS']

10
chrome/Makefile.in
View file

@ -1,10 +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)/config/rules.mk
ifdef MOZ_ENABLE_GTK
CXXFLAGS += $(TK_CFLAGS)
endif

3
chrome/moz.build
View file

@ -39,3 +39,6 @@ LOCAL_INCLUDES += [
'/netwerk/protocol/res', '/netwerk/protocol/res',
'/xpcom/components' '/xpcom/components'
] ]
if CONFIG['MOZ_ENABLE_GTK']:
CXXFLAGS += CONFIG['TK_CFLAGS']

8
content/media/Makefile.in
View file

@ -1,8 +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)/config/rules.mk
CFLAGS += $(GSTREAMER_CFLAGS)
CXXFLAGS += $(GSTREAMER_CFLAGS)

10
content/media/gstreamer/Makefile.in
View file

@ -1,10 +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)/config/rules.mk
CFLAGS += $(GSTREAMER_CFLAGS)
CXXFLAGS += $(GSTREAMER_CFLAGS)

2
content/media/gstreamer/moz.build
View file

@ -36,3 +36,5 @@ LOCAL_INCLUDES += [
'/content/html/content/src', '/content/html/content/src',
] ]
CFLAGS += CONFIG['GSTREAMER_CFLAGS']
CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']

3
content/media/moz.build
View file

@ -211,3 +211,6 @@ if CONFIG['MOZ_OMX_DECODER']:
if CONFIG['ANDROID_VERSION'] > '15': if CONFIG['ANDROID_VERSION'] > '15':
DEFINES['MOZ_OMX_WEBM_DECODER'] = True DEFINES['MOZ_OMX_WEBM_DECODER'] = True
CFLAGS += CONFIG['GSTREAMER_CFLAGS']
CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']

10
content/media/webm/Makefile.in
View file

@ -1,10 +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)/config/rules.mk
CXXFLAGS += \
$(MOZ_LIBVPX_CFLAGS) \
$(NULL)

2
content/media/webm/moz.build
View file

@ -21,6 +21,8 @@ if CONFIG['MOZ_WEBM_ENCODER']:
'WebMWriter.cpp', 'WebMWriter.cpp',
] ]
CXXFLAGS += CONFIG['MOZ_LIBVPX_CFLAGS']
FAIL_ON_WARNINGS = True FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

10
dom/base/Makefile.in
View file

@ -1,10 +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)/config/rules.mk
ifdef MOZ_X11
CXXFLAGS += $(TK_CFLAGS)
LDFLAGS += $(TK_LIBS)
endif

3
dom/base/moz.build
View file

@ -190,3 +190,6 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
MOCHITEST_MANIFESTS += ['test/mochitest.ini'] MOCHITEST_MANIFESTS += ['test/mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini'] MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
if CONFIG['MOZ_X11']:
CXXFLAGS += CONFIG['TK_CFLAGS']

28
dom/bluetooth/Makefile.in
View file

@ -1,28 +0,0 @@
# Copyright 2012 Mozilla Foundation and Mozilla contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
ifneq (,$(MOZ_B2G_BT))
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
ifdef MOZ_B2G_BT_BLUEZ
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
endif #MOZ_B2G_BT_BLUEZ
else
ifdef MOZ_ENABLE_DBUS
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
endif #MOZ_ENABLE_DBUS
endif #MOZ_WIDGET_TOOLKIT
endif #MOZ_B2G_BT

5
dom/bluetooth/moz.build
View file

@ -28,6 +28,7 @@ if CONFIG['MOZ_B2G_BT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
if CONFIG['MOZ_B2G_BT_BLUEZ']: if CONFIG['MOZ_B2G_BT_BLUEZ']:
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
SOURCES += [ SOURCES += [
'bluez/BluetoothA2dpManager.cpp', 'bluez/BluetoothA2dpManager.cpp',
'bluez/BluetoothDBusService.cpp', 'bluez/BluetoothDBusService.cpp',
@ -71,6 +72,10 @@ if CONFIG['MOZ_B2G_BT']:
DEFINES['MOZ_B2G_BT_BLUEDROID'] = True DEFINES['MOZ_B2G_BT_BLUEDROID'] = True
elif CONFIG['MOZ_ENABLE_DBUS']: elif CONFIG['MOZ_ENABLE_DBUS']:
CFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
SOURCES += [ SOURCES += [
'bluez/BluetoothDBusService.cpp', 'bluez/BluetoothDBusService.cpp',
'bluez/BluetoothHfpManager.cpp', 'bluez/BluetoothHfpManager.cpp',

28
dom/bluetooth2/Makefile.in
View file

@ -1,28 +0,0 @@
# Copyright 2012 Mozilla Foundation and Mozilla contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
ifneq (,$(MOZ_B2G_BT))
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
ifdef MOZ_B2G_BT_BLUEZ
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
endif #MOZ_B2G_BT_BLUEZ
else
ifdef MOZ_ENABLE_DBUS
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
endif #MOZ_ENABLE_DBUS
endif #MOZ_WIDGET_TOOLKIT
endif #MOZ_B2G_BT

5
dom/bluetooth2/moz.build
View file

@ -30,6 +30,7 @@ if CONFIG['MOZ_B2G_BT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
if CONFIG['MOZ_B2G_BT_BLUEZ']: if CONFIG['MOZ_B2G_BT_BLUEZ']:
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
SOURCES += [ SOURCES += [
'bluez/BluetoothA2dpManager.cpp', 'bluez/BluetoothA2dpManager.cpp',
'bluez/BluetoothDBusService.cpp', 'bluez/BluetoothDBusService.cpp',
@ -73,6 +74,10 @@ if CONFIG['MOZ_B2G_BT']:
DEFINES['MOZ_B2G_BT_BLUEDROID'] = True DEFINES['MOZ_B2G_BT_BLUEDROID'] = True
elif CONFIG['MOZ_ENABLE_DBUS']: elif CONFIG['MOZ_ENABLE_DBUS']:
CFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
SOURCES += [ SOURCES += [
'bluez/BluetoothDBusService.cpp', 'bluez/BluetoothDBusService.cpp',
'bluez/BluetoothHfpManager.cpp', 'bluez/BluetoothHfpManager.cpp',

9
dom/canvas/Makefile.in
View file

@ -1,9 +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)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)

3
dom/canvas/moz.build
View file

@ -124,3 +124,6 @@ LOCAL_INCLUDES += [
'/layout/style', '/layout/style',
'/layout/xul', '/layout/xul',
] ]
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']

7
dom/ipc/Makefile.in
View file

@ -1,7 +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)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)

2
dom/ipc/moz.build
View file

@ -147,3 +147,5 @@ JAR_MANIFESTS += ['jar.mn']
MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini'] MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
MOCHITEST_MANIFESTS += ['tests/mochitest.ini'] MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
CXXFLAGS += CONFIG['TK_CFLAGS']

11
dom/plugins/base/Makefile.in
View file

@ -1,11 +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)/config/rules.mk
CXXFLAGS += \
$(MOZ_CAIRO_CFLAGS) \
$(TK_CFLAGS) \
$(NULL)

8
dom/plugins/base/android/Makefile.in
View file

@ -1,8 +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/.
CXXFLAGS += \
$(MOZ_CAIRO_CFLAGS) \
$(NULL)

2
dom/plugins/base/android/moz.build
View file

@ -37,3 +37,5 @@ LOCAL_INCLUDES += [
] ]
DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME'] DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

3
dom/plugins/base/moz.build
View file

@ -123,3 +123,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']

16
dom/plugins/ipc/Makefile.in
View file

@ -1,16 +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)/config/rules.mk
ifneq ($(MOZ_WIDGET_TOOLKIT),gtk3)
CXXFLAGS += $(TK_CFLAGS)
else
# Force build against gtk+2 for struct offsets and such.
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
endif
CXXFLAGS += \
$(MOZ_CAIRO_CFLAGS) \
$(NULL)

7
dom/plugins/ipc/moz.build
View file

@ -126,3 +126,10 @@ LOCAL_INCLUDES += [
DEFINES['FORCE_PR_LOG'] = True DEFINES['FORCE_PR_LOG'] = True
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk3':
CXXFLAGS += CONFIG['TK_CFLAGS']
else:
# Force build against gtk+2 for struct offsets and such.
CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

4
dom/plugins/test/testplugin/testplugin.mk
View file

@ -5,8 +5,6 @@
ifeq ($(MOZ_WIDGET_TOOLKIT),qt) ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
CXXFLAGS += $(MOZ_QT_CFLAGS)
CFLAGS += $(MOZ_QT_CFLAGS)
OS_LIBS += \ OS_LIBS += \
$(MOZ_QT_LIBS) \ $(MOZ_QT_LIBS) \
$(XLDFLAGS) \ $(XLDFLAGS) \
@ -38,7 +36,5 @@ endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
ifneq (,$(filter gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
CFLAGS += $(MOZ_GTK2_CFLAGS)
OS_LIBS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) OS_LIBS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
endif endif

8
dom/plugins/test/testplugin/testplugin.mozbuild
View file

@ -52,3 +52,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and '64' in CONFIG['OS_TEST']: if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and '64' in CONFIG['OS_TEST']:
EXTRA_DSO_LDOPTS += ['-framework Carbon'] EXTRA_DSO_LDOPTS += ['-framework Carbon']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
CFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
CFLAGS += CONFIG['MOZ_QT_CFLAGS']

9
dom/src/geolocation/Makefile.in
View file

@ -1,9 +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)/config/rules.mk
ifdef MOZ_ENABLE_QT5GEOPOSITION
CXXFLAGS += $(MOZ_QT_CFLAGS)
endif

1
dom/src/geolocation/moz.build
View file

@ -29,6 +29,7 @@ if CONFIG['MOZ_ENABLE_QT5GEOPOSITION']:
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'/dom/system/qt', '/dom/system/qt',
] ]
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [

9
dom/system/qt/Makefile.in
View file

@ -1,9 +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)/config/rules.mk
ifdef MOZ_ENABLE_QT5GEOPOSITION
CXXFLAGS += $(MOZ_QT_CFLAGS)
endif

2
dom/system/qt/moz.build
View file

@ -12,6 +12,8 @@ if CONFIG['MOZ_ENABLE_QT5GEOPOSITION']:
'QTMLocationProvider.cpp', 'QTMLocationProvider.cpp',
] ]
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'/dom/src/geolocation', '/dom/src/geolocation',
] ]

6
extensions/gio/Makefile.in
View file

@ -1,6 +0,0 @@
# vim:set ts=8 sw=8 sts=8 noet:
# 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/.
LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS)

2
extensions/gio/moz.build
View file

@ -11,3 +11,5 @@ SOURCES += [
FAIL_ON_WARNINGS = True FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
CXXFLAGS += CONFIG['MOZ_GIO_CFLAGS']

2
extensions/gnomevfs/Makefile.in
View file

@ -3,8 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
LOCAL_INCLUDES = $(MOZ_GNOMEVFS_CFLAGS)
OS_LIBS += \ OS_LIBS += \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(MOZ_GNOMEVFS_LIBS) \ $(MOZ_GNOMEVFS_LIBS) \

2
extensions/gnomevfs/moz.build
View file

@ -22,3 +22,5 @@ USE_LIBS += [
'xpcomglue_s', 'xpcomglue_s',
'xul', 'xul',
] ]
CXXFLAGS += CONFIG['MOZ_GNOMEVFS_CFLAGS']

12
extensions/spellcheck/hunspell/src/Makefile.in
View file

@ -1,12 +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)/config/rules.mk
ifdef MOZ_NATIVE_HUNSPELL
# MOZ_HUNSPELL_CFLAGS is extracted through pkgconfig during configure,
# even though the variable doesn't show up in configure.in.
CXXFLAGS += $(MOZ_HUNSPELL_CFLAGS)
endif

2
extensions/spellcheck/hunspell/src/moz.build
View file

@ -28,6 +28,8 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
# This variable is referenced in configure.in. Make sure to change that file # This variable is referenced in configure.in. Make sure to change that file
# too if you need to change this variable. # too if you need to change this variable.
DEFINES['HUNSPELL_STATIC'] = True DEFINES['HUNSPELL_STATIC'] = True
else:
CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

7
gfx/2d/Makefile.in
View file

@ -1,17 +1,10 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public # 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 # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
# Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those # Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those
# macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This # macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This
# changes the symbol names of exported C++ functions that use LOGFONT. # changes the symbol names of exported C++ functions that use LOGFONT.
DEFINES := $(filter-out -DUNICODE -D_UNICODE,$(DEFINES)) DEFINES := $(filter-out -DUNICODE -D_UNICODE,$(DEFINES))
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

5
gfx/2d/moz.build
View file

@ -147,3 +147,8 @@ DEFINES['SK_B32_SHIFT'] = 0
if CONFIG['MOZ_DEBUG']: if CONFIG['MOZ_DEBUG']:
DEFINES['GFX_LOG_DEBUG'] = True DEFINES['GFX_LOG_DEBUG'] = True
DEFINES['GFX_LOG_WARNING'] = True DEFINES['GFX_LOG_WARNING'] = True
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

13
gfx/cairo/cairo/src/Makefile.in
View file

@ -8,19 +8,6 @@ MODULE_OPTIMIZE_FLAGS = -O2
endif endif
endif endif
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
OS_INCLUDES += $(MOZ_QT_CFLAGS)
endif
ifdef MOZ_X11
OS_INCLUDES += $(XCFLAGS)
endif
ifdef MOZ_ENABLE_CAIRO_FT
OS_INCLUDES += $(CAIRO_FT_CFLAGS)
endif
INSTALL_TARGETS += cairo_features INSTALL_TARGETS += cairo_features
cairo_features_FILES := cairo-features.h cairo_features_FILES := cairo-features.h
cairo_features_DEST = $(DIST)/include/cairo cairo_features_DEST = $(DIST)/include/cairo

9
gfx/cairo/cairo/src/moz.build
View file

@ -217,3 +217,12 @@ if CONFIG['GNU_CC']:
'-Wno-tautological-compare', '-Wno-tautological-compare',
'-Wno-tautological-constant-out-of-range-compare', '-Wno-tautological-constant-out-of-range-compare',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
CFLAGS += CONFIG['MOZ_QT_CFLAGS']
if CONFIG['MOZ_X11']:
CFLAGS += CONFIG['XCFLAGS']
if CONFIG['MOZ_ENABLE_CAIRO_FT']:
CFLAGS += CONFIG['CAIRO_FT_CFLAGS']

3
gfx/gl/Makefile.in
View file

@ -5,6 +5,3 @@
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
DEFINES := $(filter-out -DUNICODE,$(DEFINES)) DEFINES := $(filter-out -DUNICODE,$(DEFINES))
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)

5
gfx/gl/moz.build
View file

@ -155,3 +155,8 @@ if CONFIG['MOZ_D3DCOMPILER_XP_DLL']:
if CONFIG['MOZ_ANDROID_OMTC']: if CONFIG['MOZ_ANDROID_OMTC']:
DEFINES['MOZ_ANDROID_OMTC'] = True DEFINES['MOZ_ANDROID_OMTC'] = True
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']
CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CFLAGS += CONFIG['TK_CFLAGS']

8
gfx/ipc/Makefile.in
View file

@ -1,8 +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)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)

3
gfx/ipc/moz.build
View file

@ -29,3 +29,6 @@ SOURCES += [
include('/ipc/chromium/chromium-config.mozbuild') include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']

2
gfx/layers/Makefile.in
View file

@ -5,7 +5,5 @@
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
PremultiplyTables.h: $(srcdir)/genTables.py PremultiplyTables.h: $(srcdir)/genTables.py
$(PYTHON) $(srcdir)/genTables.py $(PYTHON) $(srcdir)/genTables.py

3
gfx/layers/moz.build
View file

@ -390,3 +390,6 @@ CXXFLAGS += [
] ]
MOCHITEST_MANIFESTS += ['apz/test/mochitest.ini'] MOCHITEST_MANIFESTS += ['apz/test/mochitest.ini']
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']

14
gfx/skia/Makefile.in
View file

@ -3,20 +3,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gonk))
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(CAIRO_FT_CFLAGS)
endif
ifdef MOZ_WIDGET_GTK
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk
ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1)
# The assembly uses the frame pointer register (r7 in Thumb/r11 in # The assembly uses the frame pointer register (r7 in Thumb/r11 in
# ARM), the compiler doesn't like that. # ARM), the compiler doesn't like that.

7
gfx/skia/generate_mozbuild.py
View file

@ -116,6 +116,13 @@ if CONFIG['GNU_CXX']:
] ]
if not CONFIG['CLANG_CXX']: if not CONFIG['CLANG_CXX']:
CXXFLAGS += ['-Wno-logical-op'] CXXFLAGS += ['-Wno-logical-op']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
""" """
import json import json

7
gfx/skia/moz.build
View file

@ -924,3 +924,10 @@ if CONFIG['GNU_CXX']:
] ]
if not CONFIG['CLANG_CXX']: if not CONFIG['CLANG_CXX']:
CXXFLAGS += ['-Wno-logical-op'] CXXFLAGS += ['-Wno-logical-op']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

16
gfx/src/Makefile.in
View file

@ -1,16 +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)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
ifdef MOZ_WIDGET_GTK
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
CXXFLAGS += $(MOZ_QT_CFLAGS)
endif

9
gfx/src/moz.build
View file

@ -70,3 +70,12 @@ FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_WIDGET_GTK']:
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']

5
gfx/tests/gtest/Makefile.in
View file

@ -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/.
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

2
gfx/tests/gtest/moz.build
View file

@ -46,3 +46,5 @@ LOCAL_INCLUDES += [
] ]
FINAL_LIBRARY = 'xul-gtest' FINAL_LIBRARY = 'xul-gtest'
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

19
gfx/thebes/Makefile.in
View file

@ -10,24 +10,5 @@ include $(topsrcdir)/config/rules.mk
DEFINES := $(filter-out -DUNICODE,$(DEFINES)) DEFINES := $(filter-out -DUNICODE,$(DEFINES))
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif
ifdef MOZ_WIDGET_GTK
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
CXXFLAGS += $(CAIRO_FT_CFLAGS) $(MOZ_PANGO_CFLAGS)
endif
DeprecatedPremultiplyTables.h: $(srcdir)/genTables.py DeprecatedPremultiplyTables.h: $(srcdir)/genTables.py
$(PYTHON) $(srcdir)/genTables.py $(PYTHON) $(srcdir)/genTables.py

11
gfx/thebes/moz.build
View file

@ -275,11 +275,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
if CONFIG[var]: if CONFIG[var]:
DEFINES[var] = True DEFINES[var] = True
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']
CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
# This is set for "normal Android", that is, when Gecko is running on # This is set for "normal Android", that is, when Gecko is running on
# top of the android java runtime. # top of the android java runtime.
DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
DEFINES['GRAPHITE2_STATIC'] = True DEFINES['GRAPHITE2_STATIC'] = True
if CONFIG['OS_TARGET'] == 'WINNT': if CONFIG['OS_TARGET'] == 'WINNT':

9
hal/Makefile.in
View file

@ -1,9 +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)/config/rules.mk
CFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)

5
hal/moz.build
View file

@ -195,3 +195,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
CXXFLAGS += ['-I%s/hardware/libhardware_legacy/include' % CONFIG['ANDROID_SOURCE']] CXXFLAGS += ['-I%s/hardware/libhardware_legacy/include' % CONFIG['ANDROID_SOURCE']]
CFLAGS += CONFIG['GLIB_CFLAGS']
CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
CXXFLAGS += CONFIG['GLIB_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']

11
image/decoders/icon/gtk/Makefile.in
View file

@ -1,11 +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)/config/rules.mk
ifdef MOZ_ENABLE_GNOMEUI
CXXFLAGS += $(MOZ_GNOMEUI_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
endif

5
image/decoders/icon/gtk/moz.build
View file

@ -11,3 +11,8 @@ SOURCES += [
FAIL_ON_WARNINGS = True FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_ENABLE_GNOMEUI']:
CXXFLAGS += CONFIG['MOZ_GNOMEUI_CFLAGS']
else:
CXXFLAGS += CONFIG['TK_CFLAGS']

7
image/decoders/icon/qt/Makefile.in
View file

@ -1,7 +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)/config/rules.mk
CXXFLAGS += $(MOZ_QT_CFLAGS)

2
image/decoders/icon/qt/moz.build
View file

@ -19,3 +19,5 @@ EXTRA_PP_COMPONENTS += [
] ]
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']

9
image/src/Makefile.in
View file

@ -1,9 +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)/config/rules.mk
# Because imgFrame.cpp includes "cairo.h"
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

3
image/src/moz.build
View file

@ -62,3 +62,6 @@ LOCAL_INCLUDES += [
# For URI-related functionality # For URI-related functionality
'/netwerk/base/src', '/netwerk/base/src',
] ]
# Because imgFrame.cpp includes "cairo.h"
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

11
intl/locale/Makefile.in
View file

@ -1,11 +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/.
ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
OS_INCLUDES += $(MOZ_QT_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk

3
intl/locale/moz.build
View file

@ -60,3 +60,6 @@ RESOURCE_FILES += [
'langGroups.properties', 'langGroups.properties',
'language.properties', 'language.properties',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']

12
intl/lwbrk/Makefile.in
View file

@ -1,12 +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)/config/rules.mk
ifdef MOZ_WIDGET_GTK
CXXFLAGS += \
$(MOZ_PANGO_CFLAGS) \
$(NULL)
endif

3
intl/lwbrk/moz.build
View file

@ -47,3 +47,6 @@ else:
MSVC_ENABLE_PGO = True MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_WIDGET_GTK']:
CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']

11
intl/unicharutil/tables/Makefile.in
View file

@ -1,11 +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)/config/rules.mk
ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
CFLAGS += $(MOZ_QT_CFLAGS)
CXXFLAGS += $(MOZ_QT_CFLAGS)
endif

4
intl/unicharutil/tables/moz.build
View file

@ -12,3 +12,7 @@ RESOURCE_FILES.entityTables = [
'mathml20.properties', 'mathml20.properties',
'transliterate.properties', 'transliterate.properties',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
CFLAGS += CONFIG['MOZ_QT_CFLAGS']
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']

6
intl/unicharutil/util/Makefile.in
View file

@ -8,9 +8,3 @@
# unicharutil_s which is built in the internal/ subdirectory. # unicharutil_s which is built in the internal/ subdirectory.
DIST_INSTALL = 1 DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk
ifdef ENABLE_INTL_API
LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
endif

4
intl/unicharutil/util/internal/Makefile.in
View file

@ -7,8 +7,4 @@
# internal linkage. Components that use frozen (external) linkage should use # internal linkage. Components that use frozen (external) linkage should use
# unicharutil_external_s. # unicharutil_external_s.
ifdef ENABLE_INTL_API
LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
endif
DIST_INSTALL = 1 DIST_INSTALL = 1

3
intl/unicharutil/util/internal/moz.build
View file

@ -14,3 +14,6 @@ LOCAL_INCLUDES += [
'..', '..',
'../../src', '../../src',
] ]
if CONFIG['ENABLE_INTL_API']:
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']

3
intl/unicharutil/util/moz.build
View file

@ -38,3 +38,6 @@ if CONFIG['_MSC_VER']:
# Don't include directives about which CRT to use # Don't include directives about which CRT to use
CFLAGS += ['-Zl'] CFLAGS += ['-Zl']
CXXFLAGS += ['-Zl'] CXXFLAGS += ['-Zl']
if CONFIG['ENABLE_INTL_API']:
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']

14
ipc/dbus/Makefile.in
View file

@ -1,14 +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/.
ifdef MOZ_ENABLE_DBUS
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_DBUS
CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
endif

6
ipc/dbus/moz.build
View file

@ -19,3 +19,9 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
FAIL_ON_WARNINGS = True FAIL_ON_WARNINGS = True
if CONFIG['MOZ_ENABLE_DBUS']:
CFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']

4
ipc/ipdl/Makefile.in
View file

@ -21,7 +21,3 @@ export:: $(ALL_IPDLSRCS)
--outcpp-dir=. \ --outcpp-dir=. \
$(IPDLDIRS:%=-I%) \ $(IPDLDIRS:%=-I%) \
$^ $^
# We #include some things in the dom/plugins/ directory that rely on
# toolkit libraries.
CXXFLAGS += $(TK_CFLAGS)

4
ipc/ipdl/moz.build
View file

@ -14,3 +14,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'
GENERATED_INCLUDES += ['/ipc/ipdl/_ipdlheaders'] GENERATED_INCLUDES += ['/ipc/ipdl/_ipdlheaders']
# We #include some things in the dom/plugins/ directory that rely on
# toolkit libraries.
CXXFLAGS += CONFIG['TK_CFLAGS']

8
layout/base/Makefile.in
View file

@ -1,8 +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)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

2
layout/base/moz.build
View file

@ -136,3 +136,5 @@ FINAL_LIBRARY = 'xul'
MOCHITEST_MANIFESTS += ['tests/mochitest.ini'] MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini'] MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
BROWSER_CHROME_MANIFESTS += ['tests/browser.ini'] BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

10
layout/build/Makefile.in
View file

@ -1,10 +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)/config/rules.mk
ifdef MOZ_GSTREAMER
CXXFLAGS += $(GSTREAMER_CFLAGS)
endif

3
layout/build/moz.build
View file

@ -131,4 +131,7 @@ if CONFIG['MOZ_FFMPEG']:
'/content/media/fmp4/ffmpeg/include', '/content/media/fmp4/ffmpeg/include',
] ]
if CONFIG['MOZ_GSTREAMER']:
CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

17
layout/generic/Makefile.in
View file

@ -1,17 +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)/config/rules.mk
CXXFLAGS += \
$(MOZ_CAIRO_CFLAGS) \
$(NULL)
ifdef MOZ_WIDGET_GTK
CXXFLAGS += $(TK_CFLAGS)
endif
ifdef MOZ_ENABLE_QT
CXXFLAGS += $(MOZ_QT_CFLAGS)
endif

8
layout/generic/moz.build
View file

@ -142,3 +142,11 @@ RESOURCE_FILES.html = [
MOCHITEST_MANIFESTS += ['test/mochitest.ini'] MOCHITEST_MANIFESTS += ['test/mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini'] MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
if CONFIG['MOZ_WIDGET_GTK']:
CXXFLAGS += CONFIG['TK_CFLAGS']
if CONFIG['MOZ_ENABLE_QT']:
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']

11
media/libcubeb/src/Makefile.in
View file

@ -1,11 +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)/config/rules.mk
CFLAGS += \
$(MOZ_ALSA_CFLAGS) \
$(MOZ_PULSEAUDIO_CFLAGS) \
$(NULL)

3
media/libcubeb/src/moz.build
View file

@ -74,3 +74,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
] ]
FAIL_ON_WARNINGS = True FAIL_ON_WARNINGS = True
CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']

15
netwerk/base/src/Makefile.in
View file

@ -1,15 +0,0 @@
# vim:set ts=8 sw=8 sts=8 noet:
#
# 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/.
ifdef MOZ_ENABLE_QTNETWORK
OS_INCLUDES += $(MOZ_QT_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_LIBCONIC
OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS)
endif

3
netwerk/base/src/moz.build
View file

@ -134,3 +134,6 @@ if CONFIG['MOZ_ENABLE_QTNETWORK']:
if CONFIG['ENABLE_TESTS']: if CONFIG['ENABLE_TESTS']:
DEFINES['PREDICTOR_TESTS'] = True DEFINES['PREDICTOR_TESTS'] = True
if CONFIG['MOZ_ENABLE_QTNETWORK']:
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']

8
netwerk/system/qt/Makefile.in
View file

@ -1,8 +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)/config/rules.mk
OS_INCLUDES += $(MOZ_QT_CFLAGS)

1
netwerk/system/qt/moz.build
View file

@ -20,3 +20,4 @@ LOCAL_INCLUDES += [
'../../base/src', '../../base/src',
] ]
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']

11
netwerk/wifi/Makefile.in
View file

@ -1,11 +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/.
ifeq ($(OS_ARCH),SunOS)
OS_INCLUDES += $(GLIB_CFLAGS)
endif
ifdef NECKO_WIFI_DBUS
OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
endif

4
netwerk/wifi/moz.build
View file

@ -44,6 +44,7 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
'nsWifiScannerWin.cpp', 'nsWifiScannerWin.cpp',
] ]
elif CONFIG['OS_ARCH'] == 'SunOS': elif CONFIG['OS_ARCH'] == 'SunOS':
CXXFLAGS += CONFIG['GLIB_CFLAGS']
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'nsWifiScannerSolaris.cpp', 'nsWifiScannerSolaris.cpp',
] ]
@ -53,4 +54,7 @@ if CONFIG['NECKO_WIFI_DBUS']:
'nsWifiScannerDBus.cpp', 'nsWifiScannerDBus.cpp',
] ]
if CONFIG['NECKO_WIFI_DBUS']:
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

4
rdf/tests/rdfcat/Makefile.in
View file

@ -6,7 +6,3 @@
EXTRA_LIBS += \ EXTRA_LIBS += \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)

2
rdf/tests/rdfcat/moz.build
View file

@ -15,3 +15,5 @@ USE_LIBS += [
'xpcomglue_s', 'xpcomglue_s',
'xul', 'xul',
] ]
CXXFLAGS += CONFIG['TK_CFLAGS']

4
rdf/tests/triplescat/Makefile.in
View file

@ -6,7 +6,3 @@
EXTRA_LIBS += \ EXTRA_LIBS += \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)

Some files were not shown because too many files have changed in this diff Show more