summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2013-11-02 02:02:47 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2013-11-16 16:31:03 +0000
commitf7ac1d5989699d31f02b120d3f8cb51b7159dbb5 (patch)
tree1496bfdd66ce80107b664c8a6a84fba6ae56e74f /src/gallium
parent096b988360158d4cf3c92d52d26f9f098774ba1d (diff)
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>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/Automake.inc6
-rw-r--r--src/gallium/winsys/freedreno/drm/Makefile.am2
-rw-r--r--src/gallium/winsys/i915/drm/Makefile.am3
-rw-r--r--src/gallium/winsys/i915/sw/Makefile.am3
-rw-r--r--src/gallium/winsys/intel/drm/Makefile.am5
-rw-r--r--src/gallium/winsys/nouveau/drm/Makefile.am3
-rw-r--r--src/gallium/winsys/radeon/drm/Makefile.am6
-rw-r--r--src/gallium/winsys/svga/drm/Makefile.am7
-rw-r--r--src/gallium/winsys/sw/dri/Makefile.am5
-rw-r--r--src/gallium/winsys/sw/fbdev/Makefile.am4
-rw-r--r--src/gallium/winsys/sw/null/Makefile.am4
-rw-r--r--src/gallium/winsys/sw/wayland/Makefile.am4
-rw-r--r--src/gallium/winsys/sw/wrapper/Makefile.am4
-rw-r--r--src/gallium/winsys/sw/xlib/Makefile.am4
14 files changed, 28 insertions, 32 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 86e9b1e2027..f67b2951f42 100644
--- 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 8a74dcdbad1..cf4c24cb81c 100644
--- 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 7a64925ba1c..82c477d68b6 100644
--- 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 186fee3963c..39f602242c3 100644
--- 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 3c4a271c5d8..30f44860766 100644
--- 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 f9645f56944..9c94ea48191 100644
--- 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 d5c54742aee..b413b0b93a0 100644
--- 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 d7ada3c6b7a..69398b85759 100644
--- 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 d987c159d3b..182825e6695 100644
--- 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 801f68993f7..93abe816185 100644
--- 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 fb450dd0035..17b52ccd617 100644
--- 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 40ec7d92d1e..0cb47a17343 100644
--- 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 3dcd6ad488c..d8bbd9e097d 100644
--- 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 ea6b7429d86..a38189c0fee 100644
--- 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