[Mesa-dev] [PATCH] r600g: Use automake to generate Makefile

[XoD]

This patch work good to me.

It fixe the build of r600g driver with libdrm compiled in non-standard dir.

Thank you

Le 13 avril 2012 20:29, Tom Stellard <tstellar at gmail.com> a écrit :

> ---
>  configure.ac                         |    1 +
>  src/gallium/drivers/r600/Makefile    |   17 -----------------
>  src/gallium/drivers/r600/Makefile.am |   17 +++++++++++++++++
>  3 files changed, 18 insertions(+), 17 deletions(-)
>  delete mode 100644 src/gallium/drivers/r600/Makefile
>  create mode 100644 src/gallium/drivers/r600/Makefile.am
>
> diff --git a/configure.ac b/configure.ac
> index df65ae5..cb7cc77 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1992,6 +1992,7 @@ dnl Substitute the config
>  AC_CONFIG_FILES([configs/autoconf
>                src/gallium/drivers/Makefile
>                src/gallium/drivers/r300/Makefile
> +               src/gallium/drivers/r600/Makefile
>                src/gbm/Makefile
>                src/gbm/main/gbm.pc
>                src/egl/drivers/Makefile
> diff --git a/src/gallium/drivers/r600/Makefile
> b/src/gallium/drivers/r600/Makefile
> deleted file mode 100644
> index e15e2ff..0000000
> --- a/src/gallium/drivers/r600/Makefile
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -TOP = ../../../..
> -include $(TOP)/configs/current
> -
> -LIBNAME = r600
> -
> -#This is for libdrm include path
> -CFLAGS+=$(RADEON_CFLAGS)
> -
> -LIBRARY_INCLUDES = -I$(TOP)/include
> -
> -# get C_SOURCES
> -include Makefile.sources
> -
> -include ../../Makefile.template
> -
> -# FIXME: Remove when this driver is converted to automake.
> -all: default
> diff --git a/src/gallium/drivers/r600/Makefile.am
> b/src/gallium/drivers/r600/Makefile.am
> new file mode 100644
> index 0000000..8acd36a
> --- /dev/null
> +++ b/src/gallium/drivers/r600/Makefile.am
> @@ -0,0 +1,17 @@
> +include Makefile.sources
> +
> +noinst_LIBRARIES = libr600.a
> +
> +AM_CFLAGS = \
> +       -I$(top_srcdir)/src/gallium/include \
> +       -I$(top_srcdir)/src/gallium/auxiliary \
> +       -I$(top_srcdir)/src/gallium/drivers \
> +       -I$(top_srcdir)/include \
> +       $(RADEON_CFLAGS) \
> +       $(DEFINES) \
> +       $(ASM_FLAGS) \
> +       $(PIC_FLAGS) \
> +       $(VISIBILITY_CFLAGS)
> +
> +libr600_a_SOURCES = \
> +       $(C_SOURCES)
> --
> 1.7.7.6
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20120414/6f24ae0e/attachment-0001.htm>