From 36066770bfc6f05566173199a1104bfade848dbb Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 29 Aug 2012 14:02:13 -0700 Subject: [PATCH] nv30: Convert to automake --- configure.ac | 1 + src/gallium/drivers/nv30/.gitignore | 1 + src/gallium/drivers/nv30/Makefile | 12 ---------- src/gallium/drivers/nv30/Makefile.am | 36 ++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 src/gallium/drivers/nv30/.gitignore delete mode 100644 src/gallium/drivers/nv30/Makefile create mode 100644 src/gallium/drivers/nv30/Makefile.am diff --git a/configure.ac b/configure.ac index 534a877511d..d0ce387b827 100644 --- a/configure.ac +++ b/configure.ac @@ -2013,6 +2013,7 @@ AC_CONFIG_FILES([configs/current src/gallium/drivers/i915/Makefile src/gallium/drivers/llvmpipe/Makefile src/gallium/drivers/nouveau/Makefile + src/gallium/drivers/nv30/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile src/gallium/drivers/rbug/Makefile diff --git a/src/gallium/drivers/nv30/.gitignore b/src/gallium/drivers/nv30/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/drivers/nv30/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile deleted file mode 100644 index de521aa2fa2..00000000000 --- a/src/gallium/drivers/nv30/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = nv30 - -include Makefile.sources - -LIBRARY_INCLUDES = \ - $(LIBDRM_CFLAGS) - -include ../../Makefile.template -# DO NOT DELETE diff --git a/src/gallium/drivers/nv30/Makefile.am b/src/gallium/drivers/nv30/Makefile.am new file mode 100644 index 00000000000..6a6cd1e3ce5 --- /dev/null +++ b/src/gallium/drivers/nv30/Makefile.am @@ -0,0 +1,36 @@ +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +include Makefile.sources +include $(top_srcdir)/src/gallium/Automake.inc + +noinst_LTLIBRARIES = libnv30.la + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(GALLIUM_CFLAGS) + +libnv30_la_SOURCES = $(C_SOURCES) + +all-local: libnv30.la + ln -f $(builddir)/.libs/libnv30.a $(builddir)/libnv30.a