diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/osmesa.pc.in (renamed from src/mesa/osmesa.pc.in) | 0 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 2ec57ea912b..bb70ed6ea36 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -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: 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@[email protected] -endif lib@OSMESA_LIB@_la_SOURCES = osmesa.c @@ -47,3 +45,6 @@ lib@OSMESA_LIB@_la_LIBADD = \ all-local: lib@[email protected] $(MKDIR_P) $(top_builddir)/$(LIB_DIR); ln -f .libs/lib@[email protected] $(top_builddir)/$(LIB_DIR)/lib@[email protected]; + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = osmesa.pc diff --git a/src/mesa/osmesa.pc.in b/src/mesa/drivers/osmesa/osmesa.pc.in index 307255ffc99..307255ffc99 100644 --- a/src/mesa/osmesa.pc.in +++ b/src/mesa/drivers/osmesa/osmesa.pc.in |