gallium/winsys: compact compiler flags into Automake.inc

Cleanup the duplicating flags and consolidate into a sigle variable.

Note: this patch adds VISIBILITY_CFLAGS to the following targets
* freedreno/drm
* i915/{drm,sw}
* nouveau/drm
* sw/fbdev
* sw/null
* sw/wayland
* sw/wrapper
* sw/xlib

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 86e9b1e20273c31e9e214cea0a7f7618f5b62c88..f67b2951f42e95105ffa505f60eb79b4a5d08e89 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -50,3 +50,9 @@ GALLIUM_VDPAU_LIB_DEPS = \
        $(VDPAU_LIBS) \
        $(LIBDRM_LIBS)
 
+GALLIUM_WINSYS_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       $(DEFINES) \
+       $(VISIBILITY_CFLAGS)

diff --git a/src/gallium/winsys/freedreno/drm/Makefile.am b/src/gallium/winsys/freedreno/drm/Makefile.am
index 8a74dcdbad1c9666f9b46da124942ad8ff22a576..cf4c24cb81cf4aef19446aa1eaab6dd99371d424 100644 (file)
--- a/src/gallium/winsys/freedreno/drm/Makefile.am
+++ b/src/gallium/winsys/freedreno/drm/Makefile.am
@@ -25,7 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
        -I$(top_srcdir)/src/gallium/drivers \
-       $(GALLIUM_CFLAGS) \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(FREEDRENO_CFLAGS)
 
 noinst_LTLIBRARIES = libfreedrenodrm.la

diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
index 7a64925ba1c2f4aa2ba540bb1f6ab1614e06ee00..82c477d68b6109acc4507f8387e3c32327bce3a8 100644 (file)
--- a/src/gallium/winsys/i915/drm/Makefile.am
+++ b/src/gallium/winsys/i915/drm/Makefile.am
@@ -24,9 +24,8 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/drivers \
-       $(GALLIUM_CFLAGS) \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(INTEL_CFLAGS)
 
 noinst_LTLIBRARIES = libi915drm.la

diff --git a/src/gallium/winsys/i915/sw/Makefile.am b/src/gallium/winsys/i915/sw/Makefile.am
index 186fee3963c1e96cb92755a715a5055462165405..39f602242c3ad5748ff72b5db551074409a6bd8e 100644 (file)
--- a/src/gallium/winsys/i915/sw/Makefile.am
+++ b/src/gallium/winsys/i915/sw/Makefile.am
@@ -24,9 +24,8 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/drivers \
-       $(GALLIUM_CFLAGS) \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(INTEL_CFLAGS)
 
 noinst_LTLIBRARIES = libi915sw.la

diff --git a/src/gallium/winsys/intel/drm/Makefile.am b/src/gallium/winsys/intel/drm/Makefile.am
index 3c4a271c5d85a9e8ec27131c3cf2bee53c8a59fa..30f44860766f633b83689a38d76505fcdb586b01 100644 (file)
--- a/src/gallium/winsys/intel/drm/Makefile.am
+++ b/src/gallium/winsys/intel/drm/Makefile.am
@@ -25,9 +25,8 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(INTEL_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(GALLIUM_WINSYS_CFLAGS) \
+       $(INTEL_CFLAGS)
 
 noinst_LTLIBRARIES = libintelwinsys.la
 

diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am
index f9645f56944d1ef4a1dea84905ecd53f402f936e..9c94ea481919d37be3bbcd9f28bcc1a30593fc34 100644 (file)
--- a/src/gallium/winsys/nouveau/drm/Makefile.am
+++ b/src/gallium/winsys/nouveau/drm/Makefile.am
@@ -24,9 +24,8 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/drivers \
-       $(GALLIUM_CFLAGS) \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(NOUVEAU_CFLAGS)
 
 noinst_LTLIBRARIES = libnouveaudrm.la

diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am
index d5c54742aee4930acb61bd378d8fcae193730465..b413b0b93a0db80b676039fe4bf7e9b0010cbd05 100644 (file)
--- a/src/gallium/winsys/radeon/drm/Makefile.am
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -2,10 +2,8 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/include \
-       $(GALLIUM_CFLAGS) \
-       $(RADEON_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(GALLIUM_WINSYS_CFLAGS) \
+       $(RADEON_CFLAGS)
 
 noinst_LTLIBRARIES = libradeonwinsys.la
 

diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am
index d7ada3c6b7a0e1c4a23c1a2b064e97846067c41a..69398b85759339d4109993fdc97d27da1a0b6bcb 100644 (file)
--- a/src/gallium/winsys/svga/drm/Makefile.am
+++ b/src/gallium/winsys/svga/drm/Makefile.am
@@ -23,16 +23,13 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
+AM_CFLAGS = \
        -I$(top_srcdir)/src/gallium/drivers/svga \
        -I$(top_srcdir)/src/gallium/drivers/svga/include \
-       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/drivers \
-       $(GALLIUM_CFLAGS) \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(LIBDRM_CFLAGS)
 
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-
 #On some systems -std= must be added to CFLAGS to be the last -std=
 CFLAGS += -std=gnu99 -D_FILE_OFFSET_BITS=64
 

diff --git a/src/gallium/winsys/sw/dri/Makefile.am b/src/gallium/winsys/sw/dri/Makefile.am
index d987c159d3b07d29031d5a88d22d2232f744b0d0..182825e6695c365a1d1e48aff8a1b2356aeff567 100644 (file)
--- a/src/gallium/winsys/sw/dri/Makefile.am
+++ b/src/gallium/winsys/sw/dri/Makefile.am
@@ -22,9 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+AM_CFLAGS = \
+       $(GALLIUM_WINSYS_CFLAGS)
 
 noinst_LTLIBRARIES = libswdri.la
 

diff --git a/src/gallium/winsys/sw/fbdev/Makefile.am b/src/gallium/winsys/sw/fbdev/Makefile.am
index 801f68993f721e28c50cdc854e519a3d8a4ca973..93abe816185431c760c990ac8e6294398a5b50f4 100644 (file)
--- a/src/gallium/winsys/sw/fbdev/Makefile.am
+++ b/src/gallium/winsys/sw/fbdev/Makefile.am
@@ -22,8 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
-       $(GALLIUM_CFLAGS)
+AM_CFLAGS = \
+       $(GALLIUM_WINSYS_CFLAGS)
 
 noinst_LTLIBRARIES = libfbdev.la
 

diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am
index fb450dd0035ff48985d25c0ca68da5668ea9e672..17b52ccd617cb97d0f9f7034f9812baa8484a255 100644 (file)
--- a/src/gallium/winsys/sw/null/Makefile.am
+++ b/src/gallium/winsys/sw/null/Makefile.am
@@ -22,8 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
-       $(GALLIUM_CFLAGS)
+AM_CFLAGS = \
+       $(GALLIUM_WINSYS_CFLAGS)
 
 noinst_LTLIBRARIES = libws_null.la
 

diff --git a/src/gallium/winsys/sw/wayland/Makefile.am b/src/gallium/winsys/sw/wayland/Makefile.am
index 40ec7d92d1ee296a55cd06d0e0011e0860e64915..0cb47a17343e904e9cb53cc4f49a5dcb70e7203e 100644 (file)
--- a/src/gallium/winsys/sw/wayland/Makefile.am
+++ b/src/gallium/winsys/sw/wayland/Makefile.am
@@ -22,8 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
-       $(GALLIUM_CFLAGS) \
+AM_CFLAGS = \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(WAYLAND_CFLAGS)
 
 noinst_LTLIBRARIES = libws_wayland.la

diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am b/src/gallium/winsys/sw/wrapper/Makefile.am
index 3dcd6ad488c9b3c0744655a424b210257b12e2e8..d8bbd9e097dd2c2d42e82adbd72bd12a7d5c88f3 100644 (file)
--- a/src/gallium/winsys/sw/wrapper/Makefile.am
+++ b/src/gallium/winsys/sw/wrapper/Makefile.am
@@ -22,8 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
-       $(GALLIUM_CFLAGS)
+AM_CFLAGS = \
+       $(GALLIUM_WINSYS_CFLAGS)
 
 noinst_LTLIBRARIES = libwsw.la
 

diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am
index ea6b7429d86a6b9cb62fdbce22fdbbea272caf58..a38189c0feee05e30ee5c4998f4aae39526342b3 100644 (file)
--- a/src/gallium/winsys/sw/xlib/Makefile.am
+++ b/src/gallium/winsys/sw/xlib/Makefile.am
@@ -22,8 +22,8 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CPPFLAGS = \
-       $(GALLIUM_CFLAGS) \
+AM_CFLAGS = \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(X11_INCLUDES)
 
 noinst_LTLIBRARIES = libws_xlib.la