diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
| commit | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (patch) | |
| tree | 3fd4cc1783510fb6ce17c4c42b4d012014008e5b /mesalib/src/mesa/drivers/dri | |
| parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
| download | vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.gz vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.bz2 vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.zip | |
mesa xserver git update 28 jan 2012
Diffstat (limited to 'mesalib/src/mesa/drivers/dri')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/Makefile.am | 37 |
2 files changed, 38 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/Makefile.am b/mesalib/src/mesa/drivers/dri/Makefile.am index 3722082eb..8b9358221 100644 --- a/mesalib/src/mesa/drivers/dri/Makefile.am +++ b/mesalib/src/mesa/drivers/dri/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS= +SUBDIRS = common if HAVE_I915_DRI SUBDIRS+=i915 diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.am b/mesalib/src/mesa/drivers/dri/common/Makefile.am new file mode 100644 index 000000000..4b43f4409 --- /dev/null +++ b/mesalib/src/mesa/drivers/dri/common/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. + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa/ \ + $(DEFINES) \ + $(ASM_FLAGS) \ + $(API_DEFINES) \ + $(LIBDRM_CFLAGS) + +noinst_LTLIBRARIES = libdricommon.la + +libdricommon_la_SOURCES = \ + utils.c \ + dri_util.c \ + xmlconfig.c |