fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 23:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move installing osmesa.pc to drivers/osmesa

Browse source 
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>
This commit is contained in:
Jon TURNEY 2012-07-26 11:07:37 +01:00
parent 2faa2b4f7e
commit 27013e5164
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -2118,7 +2118,6 @@ AC_SUBST([GALLIUM_MAKE_DIRS])
AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1)
AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1)
AM_CONDITIONAL(HAVE_OSMESA_DRIVER, echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1)
AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1)
AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1)
@ -2186,7 +2185,7 @@ AC_CONFIG_FILES([configs/current
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/x11/Makefile
src/mesa/gl.pc
src/mesa/osmesa.pc])
src/mesa/drivers/osmesa/osmesa.pc])
dnl Sort the dirs alphabetically
GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`

5
src/mesa/Makefile.am
View file

@ -140,12 +140,7 @@ all-local: libmesa.la libmesagallium.la
CLEANFILES += libmesa.a libmesagallium.a
pkgconfigdir = $(libdir)/pkgconfig
if HAVE_OSMESA_DRIVER
pkgconfig_DATA = osmesa.pc
else
pkgconfig_DATA = gl.pc
endif
# Emacs tags
tags:

5
src/mesa/drivers/osmesa/Makefile.am
View file

@ -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

0
src/mesa/osmesa.pc.in → src/mesa/drivers/osmesa/osmesa.pc.in
View file