diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/nouveau/drm/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/nouveau/drm/Makefile | 11 | ||||
| -rw-r--r-- | src/gallium/winsys/nouveau/drm/Makefile.am | 37 |
4 files changed, 39 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 05dbc733e52..e4cdee1c269 100644 --- a/configure.ac +++ b/configure.ac @@ -2029,6 +2029,7 @@ AC_CONFIG_FILES([configs/current src/gallium/winsys/Makefile src/gallium/winsys/i915/drm/Makefile src/gallium/winsys/i915/sw/Makefile + src/gallium/winsys/nouveau/drm/Makefile src/gallium/winsys/radeon/drm/Makefile src/gbm/Makefile src/gbm/main/gbm.pc diff --git a/src/gallium/winsys/nouveau/drm/.gitignore b/src/gallium/winsys/nouveau/drm/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/winsys/nouveau/drm/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/winsys/nouveau/drm/Makefile b/src/gallium/winsys/nouveau/drm/Makefile deleted file mode 100644 index ed748ac9fd6..00000000000 --- a/src/gallium/winsys/nouveau/drm/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = nouveaudrm - -C_SOURCES = nouveau_drm_winsys.c - -LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-I) -LIBRARY_DEFINES = $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-other) - -include ../../../Makefile.template diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am new file mode 100644 index 00000000000..fb04b364d5e --- /dev/null +++ b/src/gallium/winsys/nouveau/drm/Makefile.am @@ -0,0 +1,37 @@ +# 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 $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/gallium/drivers \ + $(GALLIUM_CFLAGS) \ + $(NOUVEAU_CFLAGS) + +noinst_LTLIBRARIES = libnouveaudrm.la + +libnouveaudrm_la_SOURCES = nouveau_drm_winsys.c + +#XXX: Delete this when all targets using the nouveau winsys are converted to automake. +all-local: libnouveaudrm.la + ln -f $(builddir)/.libs/libnouveaudrm.a $(builddir)/libnouveaudrm.a |