fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 21:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/winsys: compact compiler flags into Automake.inc

Browse source 
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>
This commit is contained in:
Emil Velikov 2013-11-02 02:02:47 +00:00
parent 096b988360
commit f7ac1d5989
14 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/Automake.inc
View file

@ -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)

2
src/gallium/winsys/freedreno/drm/Makefile.am
View file

@ -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

3
src/gallium/winsys/i915/drm/Makefile.am
View file

@ -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

3
src/gallium/winsys/i915/sw/Makefile.am
View file

@ -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

5
src/gallium/winsys/intel/drm/Makefile.am
View file

@ -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

3
src/gallium/winsys/nouveau/drm/Makefile.am
View file

@ -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

6
src/gallium/winsys/radeon/drm/Makefile.am
View file

@ -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

7
src/gallium/winsys/svga/drm/Makefile.am
View file

@ -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

5
src/gallium/winsys/sw/dri/Makefile.am
View file

@ -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

4
src/gallium/winsys/sw/fbdev/Makefile.am
View file

@ -22,8 +22,8 @@
include $(top_srcdir)/src/gallium/Automake.inc
AM_CPPFLAGS = \
$(GALLIUM_CFLAGS)
AM_CFLAGS = \
$(GALLIUM_WINSYS_CFLAGS)
noinst_LTLIBRARIES = libfbdev.la

4
src/gallium/winsys/sw/null/Makefile.am
View file

@ -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

4
src/gallium/winsys/sw/wayland/Makefile.am
View file

@ -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

4
src/gallium/winsys/sw/wrapper/Makefile.am
View file

@ -22,8 +22,8 @@
include $(top_srcdir)/src/gallium/Automake.inc
AM_CPPFLAGS = \
$(GALLIUM_CFLAGS)
AM_CFLAGS = \
$(GALLIUM_WINSYS_CFLAGS)
noinst_LTLIBRARIES = libwsw.la

4
src/gallium/winsys/sw/xlib/Makefile.am
View file

@ -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