summaryrefslogtreecommitdiff
path: root/src/glx/x11/Makefile
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-03-10 18:43:53 -0400
committerKristian Høgsberg <krh@redhat.com>2008-03-10 18:46:19 -0400
commitfe23dc5ecae87de73f7b5a581868065a4c4ac09b (patch)
treeccd3ffe6f088ee257f5eca3206ea3ae31c8342de /src/glx/x11/Makefile
parent3731159ec6e1527655d91b3eb364d5c2d252ac60 (diff)
Move make install logic for libGL back into src/mesa/Makefile.
This makes make install work again for non-glx libGL implementations. The make install logic is split into three sub-targets: install-libgl, install-osmesa, install-drivers. The install target in src/glx/x11 is then implemented using the src/mesa make install-libgl rule. Thanks to Dan Nicholson for pointing out the breakage.
Diffstat (limited to 'src/glx/x11/Makefile')
-rw-r--r--src/glx/x11/Makefile17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 1cef21cdae..8fa3700a04 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: