diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/common/Makefile.am | 37 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.am | 13 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 13 |
3 files changed, 43 insertions, 20 deletions
diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am new file mode 100644 index 00000000000..4b43f44091c --- /dev/null +++ b/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 diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 5c44a9e7dc0..bcfde69d700 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -46,23 +46,16 @@ if HAVE_I915_DRI dri_LTLIBRARIES = i915_dri.la endif -# These should be an ltlibrary that's built once. Let's fix that once -# the other drivers are converted to automake. -COMMON_FILES = \ - ../common/utils.c \ - ../common/dri_util.c \ - ../common/xmlconfig.c - i915_dri_la_SOURCES = \ $(i915_C_FILES) \ - $(i915_CXX_FILES) \ - $(COMMON_FILES) + $(i915_CXX_FILES) i915_dri_la_LDFLAGS = -module -avoid-version -shared i915_dri_la_LIBADD = \ $(DRI_LIB_DEPS) \ $(DRICORE_LIB_DEPS) \ - $(INTEL_LIBS) + $(INTEL_LIBS) \ + ../common/libdricommon.la # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the driver into /lib of the build tree. diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 55123814a7b..b1f0a80350d 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -47,23 +47,16 @@ if HAVE_I965_DRI dri_LTLIBRARIES = i965_dri.la endif -# These should be an ltlibrary that's built once. Let's fix that once -# the other drivers are converted to automake. -COMMON_FILES = \ - ../common/utils.c \ - ../common/dri_util.c \ - ../common/xmlconfig.c - i965_dri_la_SOURCES = \ $(i965_C_FILES) \ - $(i965_CXX_FILES) \ - $(COMMON_FILES) + $(i965_CXX_FILES) i965_dri_la_LDFLAGS = -module -avoid-version -shared i965_dri_la_LIBADD = \ $(DRI_LIB_DEPS) \ $(DRICORE_LIB_DEPS) \ - $(INTEL_LIBS) + $(INTEL_LIBS) \ + ../common/libdricommon.la # Test build to make sure that we didn't leave any undefined symbols in the # driver. |