[Mesa-dev] [PATCH 1/4] i915: Fix driver after automakeification.

Matt Turner mattst88 at gmail.com
Wed Jan 25 14:48:12 PST 2012


On Wed, Jan 25, 2012 at 5:29 PM, Eric Anholt <eric at anholt.net> wrote:
> ---
>  src/mesa/drivers/dri/i915/Makefile.am |   10 +++++++++-
>  1 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
> index 6bc7061..5c44a9e 100644
> --- a/src/mesa/drivers/dri/i915/Makefile.am
> +++ b/src/mesa/drivers/dri/i915/Makefile.am
> @@ -46,9 +46,17 @@ if HAVE_I915_DRI
>  dri_LTLIBRARIES = i915_dri.la
>  endif
>
> +# These should be an ltlibrary that's built once.  Let's fix that once
> +# the other drivers are converted to automake.
> +COMMON_FILES = \
> +       ../common/utils.c \
> +       ../common/dri_util.c \
> +       ../common/xmlconfig.c
> +
>  i915_dri_la_SOURCES = \
>        $(i915_C_FILES) \
> -       $(i915_CXX_FILES)
> +       $(i915_CXX_FILES) \
> +       $(COMMON_FILES)
>
>  i915_dri_la_LDFLAGS = -module -avoid-version -shared
>  i915_dri_la_LIBADD = \
> --
> 1.7.7.3

Looks like I missed that -- r200, radeon, and nouveau need the same
change. Maybe we should just do as the comment says and build an
ltlibrary out of those files and link that into every driver now that
all are using automake now?

Would the link test have helped me here?


More information about the mesa-dev mailing list