summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/osmesa/Makefile.am
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-07-26 11:07:37 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-07-31 12:48:33 +0100
commit27013e5164a1823d5bdcb5ca21ae4ca0df40b8f8 (patch)
tree8e7d259003296b6a557b18570447306d5830e456 /src/mesa/drivers/osmesa/Makefile.am
parent2faa2b4f7e4d5a230d5e2ec55bea06eab8dd8fba (diff)
Move installing osmesa.pc to drivers/osmesa
Move installing osmesa.pc to drivers/osmesa, where it belongs better This also restores the installation of gl.pc if we are building osmesa at the same time as libGL, which was broken in commit 39785488 when the .pc installation was converted to automake v2: Remove HAVE_OSMESA_DRIVER automake conditional, it's now pointless as we will only be building in the drivers/osmesa directory if the condition it checked was true. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/osmesa/Makefile.am')
-rw-r--r--src/mesa/drivers/osmesa/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 59ee62a7a66..dbee925dd79 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -31,9 +31,7 @@ AM_CFLAGS = \
$(DEFINES) \
$(API_DEFINES)
-if HAVE_OSMESA_DRIVER
lib_LTLIBRARIES = lib@OSMESA_LIB@.la
-endif
lib@OSMESA_LIB@_la_SOURCES = osmesa.c
@@ -47,3 +45,6 @@ lib@OSMESA_LIB@_la_LIBADD = \
all-local: lib@OSMESA_LIB@.la
$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = osmesa.pc