diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/Makefile | 16 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/Makefile.am | 38 |
4 files changed, 40 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 97fd29d43ce..534a877511d 100644 --- a/configure.ac +++ b/configure.ac @@ -2012,6 +2012,7 @@ AC_CONFIG_FILES([configs/current src/gallium/drivers/Makefile src/gallium/drivers/i915/Makefile src/gallium/drivers/llvmpipe/Makefile + src/gallium/drivers/nouveau/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile src/gallium/drivers/rbug/Makefile diff --git a/src/gallium/drivers/nouveau/.gitignore b/src/gallium/drivers/nouveau/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/drivers/nouveau/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/drivers/nouveau/Makefile b/src/gallium/drivers/nouveau/Makefile deleted file mode 100644 index d583324b021..00000000000 --- a/src/gallium/drivers/nouveau/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = nouveau - -LIBRARY_INCLUDES = \ - $(LIBDRM_CFLAGS) \ - -I$(TOP)/src/gallium/drivers/nouveau/include - -LIBRARY_INCLUDES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-I) -LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-other) - -# get C_SOURCES -include Makefile.sources - -include ../../Makefile.template diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am new file mode 100644 index 00000000000..ca4623f0063 --- /dev/null +++ b/src/gallium/drivers/nouveau/Makefile.am @@ -0,0 +1,38 @@ +# 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 = libnouveau.la + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers/nouveau/include \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) + +libnouveau_la_SOURCES = $(C_SOURCES) + +all-local: libnouveau.la + ln -f $(builddir)/.libs/libnouveau.a $(builddir)/libnouveau.a |