summaryrefslogtreecommitdiffstats
path: root/src/glx/x11
diff options
context:
space:
mode:
Diffstat (limited to 'src/glx/x11')
-rw-r--r--src/glx/x11/Makefile17
-rw-r--r--src/glx/x11/gl.pc.in11
2 files changed, 2 insertions, 26 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 1cef21cdae4..8fa3700a04c 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -80,21 +80,8 @@ depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
tags:
etags `find . -name \*.[ch]` `find $(TOP)/include`
-pcedit = sed \
- -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
- -e 's,@LIB_DIR@,$(LIB_DIR),' \
- -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
-
-gl.pc: gl.pc.in
- $(pcedit) $< > $@
-
-install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) gl.pc
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
- $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL
- $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
- $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+ make -C $(TOP)/src/mesa install-libgl
# Remove .o and backup files
clean:
diff --git a/src/glx/x11/gl.pc.in b/src/glx/x11/gl.pc.in
deleted file mode 100644
index 4b144ffa4b2..00000000000
--- a/src/glx/x11/gl.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
-
-Name: gl
-Description: Mesa OpenGL library
-Requires:
-Version: @VERSION@
-Libs: -L${libdir} -lGL
-Cflags: -I${includedir}