diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/Makefile | 19 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/Makefile.am | 41 |
4 files changed, 43 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index e4cdee1c269..7003ae69a89 100644 --- a/configure.ac +++ b/configure.ac @@ -2031,6 +2031,7 @@ AC_CONFIG_FILES([configs/current src/gallium/winsys/i915/sw/Makefile src/gallium/winsys/nouveau/drm/Makefile src/gallium/winsys/radeon/drm/Makefile + src/gallium/winsys/svga/drm/Makefile src/gbm/Makefile src/gbm/main/gbm.pc src/glsl/Makefile diff --git a/src/gallium/winsys/svga/drm/.gitignore b/src/gallium/winsys/svga/drm/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/winsys/svga/drm/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/winsys/svga/drm/Makefile b/src/gallium/winsys/svga/drm/Makefile deleted file mode 100644 index 02ea91bf334..00000000000 --- a/src/gallium/winsys/svga/drm/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = svgadrm - -# get C_SOURCES -include Makefile.sources - -LIBRARY_INCLUDES = \ - -I$(TOP)/src/gallium/drivers/svga \ - -I$(TOP)/src/gallium/drivers/svga/include \ - $(shell $(PKG_CONFIG) libdrm --cflags-only-I) - -LIBRARY_DEFINES = \ - -std=gnu99 -fvisibility=hidden \ - -DHAVE_STDINT_H -D_FILE_OFFSET_BITS=64 \ - $(shell $(PKG_CONFIG) libdrm --cflags-only-other) - -include ../../../Makefile.template diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am new file mode 100644 index 00000000000..fadd750b057 --- /dev/null +++ b/src/gallium/winsys/svga/drm/Makefile.am @@ -0,0 +1,41 @@ +# 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 \ + -I$(top_srcdir)/src/gallium/drivers/svga/include \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/gallium/drivers \ + $(GALLIUM_CFLAGS) \ + $(LIBDRM_CFLAGS) +AM_CFLAGS = -std=gnu99 -D_FILE_OFFSET_BITS=64 + +noinst_LTLIBRARIES = libsvgadrm.la + +libsvgadrm_la_SOURCES = $(C_SOURCES) + +#XXX: Delete this when all targets using the svga winsys are converted to automake. +all-local: libsvgadrm.la + ln -f $(builddir)/.libs/libsvgadrm.a $(builddir)/libsvgadrm.a |