Automake.inc already provides GALLIUM_VIDEO_CFLAGS, which provide the essential compiler flags needed.
Note: this commit adds VISIBILITY_CFLAGS to nouveau and softpipe. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> --- src/gallium/targets/r300/xvmc/Makefile.am | 8 +------- src/gallium/targets/r600/xvmc/Makefile.am | 8 +------- src/gallium/targets/xvmc-nouveau/Makefile.am | 7 +------ src/gallium/targets/xvmc-softpipe/Makefile.am | 8 ++------ 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/gallium/targets/r300/xvmc/Makefile.am b/src/gallium/targets/r300/xvmc/Makefile.am index f52f691..32d40b6 100644 --- a/src/gallium/targets/r300/xvmc/Makefile.am +++ b/src/gallium/targets/r300/xvmc/Makefile.am @@ -23,13 +23,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys + $(GALLIUM_VIDEO_CFLAGS) xvmcdir = $(XVMC_LIB_INSTALL_DIR) xvmc_LTLIBRARIES = libXvMCr300.la diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am index c4b57af..7a55b86 100644 --- a/src/gallium/targets/r600/xvmc/Makefile.am +++ b/src/gallium/targets/r600/xvmc/Makefile.am @@ -23,13 +23,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - $(LIBDRM_CFLAGS) \ - $(VISIBILITY_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys + $(GALLIUM_VIDEO_CFLAGS) xvmcdir = $(XVMC_LIB_INSTALL_DIR) xvmc_LTLIBRARIES = libXvMCr600.la diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am index c7b31e5..4100ad7 100644 --- a/src/gallium/targets/xvmc-nouveau/Makefile.am +++ b/src/gallium/targets/xvmc-nouveau/Makefile.am @@ -23,12 +23,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - $(LIBDRM_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys + $(GALLIUM_VIDEO_CFLAGS) xvmcdir = $(XVMC_LIB_INSTALL_DIR) xvmc_LTLIBRARIES = libXvMCnouveau.la diff --git a/src/gallium/targets/xvmc-softpipe/Makefile.am b/src/gallium/targets/xvmc-softpipe/Makefile.am index 1cf2254..1833a8e 100644 --- a/src/gallium/targets/xvmc-softpipe/Makefile.am +++ b/src/gallium/targets/xvmc-softpipe/Makefile.am @@ -23,13 +23,9 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - $(LIBDRM_CFLAGS) + $(GALLIUM_VIDEO_CFLAGS) AM_CPPFLAGS = \ - -DGALLIUM_SOFTPIPE \ - -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys + -DGALLIUM_SOFTPIPE xvmcdir = $(XVMC_LIB_INSTALL_DIR) xvmc_LTLIBRARIES = libXvMCsoftpipe.la -- 1.8.4.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
