OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automake: Convert osmesa.pc to be generated by configure.

Browse Source
This commit is contained in:
Eric Anholt
2012-05-15 12:47:58 -07:00
parent fa4cf4dc0c
commit bd18a236de
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -2186,7 +2186,8 @@ AC_CONFIG_FILES([configs/current
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]) src/mesa/gl.pc
src/mesa/osmesa.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" " "`

18
src/mesa/Makefile
View File

@@ -161,21 +161,6 @@ install: default $(DRICORE_INSTALL_TARGET)
esac ; \ esac ; \
done done
pcedit = \
-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
osmesa_pcedit = sed \
$(pcedit) \
-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
-e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
-e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
osmesa.pc: osmesa.pc.in
$(osmesa_pcedit) $< > $@
install-headers: install-headers:
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
$(INSTALL) -m 644 $(TOP)/include/GL/*.h \ $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
@@ -186,7 +171,7 @@ install-libgl-pc: install-headers
$(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
install-osmesa: default osmesa.pc install-osmesa: default
$(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
$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \ $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
@@ -208,7 +193,6 @@ 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 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/osmesa.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: osmesa Name: osmesa
Description: Mesa Off-screen Rendering library Description: Mesa Off-screen Rendering library
Requires: @OSMESA_PC_REQ@ Requires: @OSMESA_PC_REQ@
Version: @VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -l@OSMESA_LIB@ Libs: -L${libdir} -l@OSMESA_LIB@
Libs.private: @OSMESA_PC_LIB_PRIV@ Libs.private: @OSMESA_PC_LIB_PRIV@
Cflags: -I${includedir} Cflags: -I${includedir}