From 4f12e5d53c8a349320883b093c19d91874f9f46a Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 19 Jan 2014 14:11:48 +0100 Subject: fontconfig mesa git update 19 Jan 2013 fontconfig commit 5918d5bea5416cf27061db4263aefeb8fd310f0e mesa commit a33d1339d5bfb32377be92957a493f0e3d84b31e --- mesalib/src/loader/Makefile.am | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 mesalib/src/loader/Makefile.am (limited to 'mesalib/src/loader/Makefile.am') diff --git a/mesalib/src/loader/Makefile.am b/mesalib/src/loader/Makefile.am new file mode 100644 index 000000000..a118fef1d --- /dev/null +++ b/mesalib/src/loader/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 Makefile.sources + +noinst_LTLIBRARIES = libloader.la + +libloader_la_CPPFLAGS = \ + $(DEFINES) \ + -I$(top_srcdir)/include \ + $(VISIBILITY_CFLAGS) \ + $(LIBDRM_CFLAGS) \ + $(LIBUDEV_CFLAGS) + +libloader_la_LIBADD = \ + $(LIBDRM_LIBS) \ + $(LIBUDEV_LIBS) + +libloader_la_SOURCES = $(LOADER_C_FILES) -- cgit v1.2.3 From 775780ea274e6602c2d64de33a98ee35979cc330 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 20 Jan 2014 17:37:27 +0100 Subject: ligXext mesa git update 20 Jan 2014 libXext commit d5447c0156f556114dbf97d6064c0c7b0fcd5f70 mesa commit 799abb271a248f646faa5cc859968f8c71e1ef16 --- mesalib/src/loader/Makefile.am | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'mesalib/src/loader/Makefile.am') diff --git a/mesalib/src/loader/Makefile.am b/mesalib/src/loader/Makefile.am index a118fef1d..371dd575c 100644 --- a/mesalib/src/loader/Makefile.am +++ b/mesalib/src/loader/Makefile.am @@ -27,11 +27,20 @@ libloader_la_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ $(VISIBILITY_CFLAGS) \ - $(LIBDRM_CFLAGS) \ $(LIBUDEV_CFLAGS) libloader_la_LIBADD = \ - $(LIBDRM_LIBS) \ $(LIBUDEV_LIBS) +if !HAVE_LIBDRM +libloader_la_CPPFLAGS += \ + -D__NOT_HAVE_DRM_H +else +libloader_la_CPPFLAGS += \ + $(LIBDRM_CFLAGS) + +libloader_la_LIBADD += \ + $(LIBDRM_LIBS) +endif + libloader_la_SOURCES = $(LOADER_C_FILES) -- cgit v1.2.3