From 0a42131f3b7f82dd9cd823e2c40f319bd8c01db2 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 29 Aug 2012 12:29:47 -0700 Subject: [PATCH] svga: Convert to automake --- configure.ac | 1 + src/gallium/drivers/svga/.gitignore | 1 + src/gallium/drivers/svga/Makefile | 19 ------------------ src/gallium/drivers/svga/Makefile.am | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 src/gallium/drivers/svga/.gitignore delete mode 100644 src/gallium/drivers/svga/Makefile create mode 100644 src/gallium/drivers/svga/Makefile.am diff --git a/configure.ac b/configure.ac index fa1c48a..97fd29d 100644 --- a/configure.ac +++ b/configure.ac @@ -2016,6 +2016,7 @@ AC_CONFIG_FILES([configs/current src/gallium/drivers/r600/Makefile src/gallium/drivers/rbug/Makefile src/gallium/drivers/softpipe/Makefile + src/gallium/drivers/svga/Makefile src/gallium/drivers/trace/Makefile src/gallium/state_trackers/clover/Makefile src/gallium/targets/Makefile diff --git a/src/gallium/drivers/svga/.gitignore b/src/gallium/drivers/svga/.gitignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/src/gallium/drivers/svga/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile deleted file mode 100644 index 97f68f0..0000000 --- a/src/gallium/drivers/svga/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = svga - -# get C_SOURCES -include Makefile.sources - -LIBRARY_INCLUDES = \ - -I$(TOP)/src/gallium/drivers/svga/include - -# With linux-debug we get a lots of warnings, filter out the bad flags. -CFLAGS := $(filter-out -pedantic, $(filter-out -ansi, $(CFLAGS))) - -LIBRARY_DEFINES = \ - -std=gnu99 -fvisibility=hidden \ - -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H - -include ../../Makefile.template diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am new file mode 100644 index 0000000..426fc89 --- /dev/null +++ b/src/gallium/drivers/svga/Makefile.am @@ -0,0 +1,39 @@ +# 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 + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers/svga/include \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(GALLIUM_CFLAGS) + +AM_CFLAGS = -std=gnu99 + +noinst_LTLIBRARIES = libsvga.la + +libsvga_la_SOURCES = $(C_SOURCES) + +all-local: libsvga.la + ln -f $(builddir)/.libs/libsvga.a $(builddir)/libsvga.a -- 2.7.4