Bug 1042878 - part 2 - move MOZ_CAIRO_CFLAGS et al additions to C*FLA…

…GS into moz.build; r=glandium
EtlerEdelgard · Jul 24, 2014 · 12c76f1 · 12c76f1
1 parent 2ed4280
commit 12c76f1
Show file tree

Hide file tree

Showing 161 changed files with 288 additions and 724 deletions.
diff --git a/accessible/atk/Makefile.in b/accessible/atk/Makefile.in
diff --git a/accessible/atk/moz.build b/accessible/atk/moz.build
@@ -41,3 +41,10 @@ LOCAL_INCLUDES += [
 ]
 
 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']
diff --git a/accessible/base/Makefile.in b/accessible/base/Makefile.in
diff --git a/accessible/base/moz.build b/accessible/base/moz.build
@@ -90,3 +90,6 @@ else:
     ]
 
 FINAL_LIBRARY = 'xul'
+
+if CONFIG['MOZ_ENABLE_GTK']:
+    CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff --git a/browser/components/shell/Makefile.in b/browser/components/shell/Makefile.in
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
@@ -47,3 +47,5 @@ EXTRA_COMPONENTS += [
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
+
+CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/chrome/Makefile.in b/chrome/Makefile.in
diff --git a/chrome/moz.build b/chrome/moz.build
@@ -39,3 +39,6 @@ LOCAL_INCLUDES += [
     '/netwerk/protocol/res',
     '/xpcom/components'
 ]
+
+if CONFIG['MOZ_ENABLE_GTK']:
+    CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in
diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build
@@ -36,3 +36,5 @@ LOCAL_INCLUDES += [
     '/content/html/content/src',
 ]
 
+CFLAGS += CONFIG['GSTREAMER_CFLAGS']
+CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
diff --git a/content/media/moz.build b/content/media/moz.build
@@ -211,3 +211,6 @@ if CONFIG['MOZ_OMX_DECODER']:
 
 if CONFIG['ANDROID_VERSION'] > '15':
     DEFINES['MOZ_OMX_WEBM_DECODER'] = True
+
+CFLAGS += CONFIG['GSTREAMER_CFLAGS']
+CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in
diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build
@@ -21,6 +21,8 @@ if CONFIG['MOZ_WEBM_ENCODER']:
                         'WebMWriter.cpp',
     ]
 
+CXXFLAGS += CONFIG['MOZ_LIBVPX_CFLAGS']
+
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
diff --git a/dom/base/moz.build b/dom/base/moz.build
@@ -190,3 +190,6 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+if CONFIG['MOZ_X11']:
+    CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build
@@ -28,6 +28,7 @@ if CONFIG['MOZ_B2G_BT']:
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         if CONFIG['MOZ_B2G_BT_BLUEZ']:
+            CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
             SOURCES += [
                 'bluez/BluetoothA2dpManager.cpp',
                 'bluez/BluetoothDBusService.cpp',
@@ -71,6 +72,10 @@ if CONFIG['MOZ_B2G_BT']:
 
             DEFINES['MOZ_B2G_BT_BLUEDROID'] = True
     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 += [
             'bluez/BluetoothDBusService.cpp',
             'bluez/BluetoothHfpManager.cpp',

diff --git a/dom/bluetooth2/Makefile.in b/dom/bluetooth2/Makefile.in
diff --git a/dom/bluetooth2/moz.build b/dom/bluetooth2/moz.build
@@ -30,6 +30,7 @@ if CONFIG['MOZ_B2G_BT']:
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         if CONFIG['MOZ_B2G_BT_BLUEZ']:
+            CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
             SOURCES += [
                 'bluez/BluetoothA2dpManager.cpp',
                 'bluez/BluetoothDBusService.cpp',
@@ -73,6 +74,10 @@ if CONFIG['MOZ_B2G_BT']:
 
             DEFINES['MOZ_B2G_BT_BLUEDROID'] = True
     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 += [
             'bluez/BluetoothDBusService.cpp',
             'bluez/BluetoothHfpManager.cpp',

diff --git a/dom/canvas/Makefile.in b/dom/canvas/Makefile.in
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
@@ -124,3 +124,6 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/layout/xul',
 ]
+
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
@@ -147,3 +147,5 @@ JAR_MANIFESTS += ['jar.mn']
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
+
+CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in
diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in
diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build
@@ -37,3 +37,5 @@ LOCAL_INCLUDES += [
 ]
 
 DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']
+
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
@@ -123,3 +123,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
 
 FINAL_LIBRARY = 'xul'
+
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build
@@ -126,3 +126,10 @@ LOCAL_INCLUDES += [
 
 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']
diff --git a/dom/plugins/test/testplugin/testplugin.mk b/dom/plugins/test/testplugin/testplugin.mk
@@ -5,8 +5,6 @@
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 include $(topsrcdir)/config/config.mk
-CXXFLAGS        += $(MOZ_QT_CFLAGS)
-CFLAGS          += $(MOZ_QT_CFLAGS)
 OS_LIBS += \
                 $(MOZ_QT_LIBS) \
                 $(XLDFLAGS) \
@@ -38,7 +36,5 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(filter gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
-CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
-CFLAGS          += $(MOZ_GTK2_CFLAGS)
 OS_LIBS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
 endif
diff --git a/dom/plugins/test/testplugin/testplugin.mozbuild b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -52,3 +52,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and '64' in CONFIG['OS_TEST']:
     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']
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build
@@ -29,6 +29,7 @@ if CONFIG['MOZ_ENABLE_QT5GEOPOSITION']:
     LOCAL_INCLUDES += [
         '/dom/system/qt',
     ]
+    CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     LOCAL_INCLUDES += [

diff --git a/dom/system/qt/Makefile.in b/dom/system/qt/Makefile.in
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,5 @@ EXTRA_COMPONENTS += [

		for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
		DEFINES[var] = '"%s"' % CONFIG[var]

		CXXFLAGS += CONFIG['TK_CFLAGS']
Original file line number	Diff line number	Diff line change
Expand Up		@@ -147,3 +147,5 @@ JAR_MANIFESTS += ['jar.mn']

		MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
		MOCHITEST_MANIFESTS += ['tests/mochitest.ini']

		CXXFLAGS += CONFIG['TK_CFLAGS']
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ LOCAL_INCLUDES += [
		]

		DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']

		CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']