diff options
| author | Jon TURNEY <[email protected]> | 2012-07-26 11:07:37 +0100 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2012-07-31 12:48:33 +0100 |
| commit | 27013e5164a1823d5bdcb5ca21ae4ca0df40b8f8 (patch) | |
| tree | 8e7d259003296b6a557b18570447306d5830e456 /src/mesa/drivers | |
| parent | 2faa2b4f7e4d5a230d5e2ec55bea06eab8dd8fba (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 <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/osmesa.pc.in | 12 |
2 files changed, 15 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@[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/drivers/osmesa/osmesa.pc.in b/src/mesa/drivers/osmesa/osmesa.pc.in new file mode 100644 index 00000000000..307255ffc99 --- /dev/null +++ b/src/mesa/drivers/osmesa/osmesa.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=@libdir@ +includedir=@includedir@ + +Name: osmesa +Description: Mesa Off-screen Rendering library +Requires: @OSMESA_PC_REQ@ +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -l@OSMESA_LIB@ +Libs.private: @OSMESA_PC_LIB_PRIV@ +Cflags: -I${includedir} |