fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 19:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Convert gl.pc to be generated by configure.

Browse source 
This saves a step of mashing variables around in our Makefile.
This commit is contained in:
Eric Anholt 2012-05-15 12:23:00 -07:00
parent 2d4b77c7c6
commit fa4cf4dc0c
3 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -2185,7 +2185,8 @@ AC_CONFIG_FILES([configs/current
src/mesa/drivers/dri/r200/Makefile src/mesa/drivers/dri/r200/Makefile
src/mesa/drivers/dri/radeon/Makefile src/mesa/drivers/dri/radeon/Makefile
src/mesa/drivers/dri/swrast/Makefile src/mesa/drivers/dri/swrast/Makefile
src/mesa/drivers/x11/Makefile]) src/mesa/drivers/x11/Makefile
src/mesa/gl.pc])
dnl Sort the dirs alphabetically dnl Sort the dirs alphabetically
GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "` GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`

16
src/mesa/Makefile
View file

@ -167,18 +167,6 @@ pcedit = \
-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
gl_pcedit = sed \
$(pcedit) \
-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
-e 's,@GLX_TLS@,$(GLX_TLS),' \
-e 's,@GL_LIB@,$(GL_LIB),'
gl.pc: gl.pc.in
$(gl_pcedit) $< > $@
osmesa_pcedit = sed \ osmesa_pcedit = sed \
$(pcedit) \ $(pcedit) \
-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \ -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
@ -193,7 +181,7 @@ install-headers:
$(INSTALL) -m 644 $(TOP)/include/GL/*.h \ $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
$(DESTDIR)$(INSTALL_INC_DIR)/GL $(DESTDIR)$(INSTALL_INC_DIR)/GL
install-libgl-pc: gl.pc install-headers install-libgl-pc: install-headers
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
@ -220,7 +208,7 @@ clean:
-rm -f */*/*.o -rm -f */*/*.o
-rm -f depend depend.bak libmesa.a libmesagallium.a -rm -f depend depend.bak libmesa.a libmesagallium.a
-rm -f drivers/*/*.o -rm -f drivers/*/*.o
-rm -f *.pc -rm -f osmesa.pc
-rm -f $(BUILT_SOURCES) -rm -f $(BUILT_SOURCES)
-@cd drivers/dri && $(MAKE) clean -@cd drivers/dri && $(MAKE) clean
-@cd drivers/x11 && $(MAKE) clean -@cd drivers/x11 && $(MAKE) clean

8
src/mesa/gl.pc.in
View file

@ -1,12 +1,12 @@
prefix=@INSTALL_DIR@ prefix=@prefix@
exec_prefix=${prefix} exec_prefix=${prefix}
libdir=@INSTALL_LIB_DIR@ libdir=@libdir@
includedir=@INSTALL_INC_DIR@ includedir=@includedir@
Name: gl Name: gl
Description: Mesa OpenGL library Description: Mesa OpenGL library
Requires.private: @GL_PC_REQ_PRIV@ Requires.private: @GL_PC_REQ_PRIV@
Version: @VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -l@GL_LIB@ Libs: -L${libdir} -l@GL_LIB@
Libs.private: @GL_PC_LIB_PRIV@ Libs.private: @GL_PC_LIB_PRIV@
Cflags: -I${includedir} @GL_PC_CFLAGS@ Cflags: -I${includedir} @GL_PC_CFLAGS@