summaryrefslogtreecommitdiff
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
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.
-rw-r--r--src/glx/x11/Makefile17
-rw-r--r--src/mesa/Makefile24
-rw-r--r--src/mesa/gl.pc.in (renamed from src/glx/x11/gl.pc.in)0
3 files changed, 24 insertions, 17 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:
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 87c5e6126d..695a416094 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -150,20 +150,40 @@ subdirs:
(cd x86-64 ; $(MAKE)) ; \
fi
+pcedit = sed \
+ -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+ -e 's,@LIB_DIR@,$(LIB_DIR),' \
+ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
-install: default
+gl.pc: gl.pc.in
+ $(pcedit) $< > $@
+
+install-libgl: 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
+ @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* \
+ $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
+ fi
+ $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+
+install-osmesa:
@if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
- $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
+ $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* \
+ $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
fi
+
+install-drivers:
@for target in $(DRIVER_DIRS); do \
case "$$target" in \
dri) cd drivers/dri ; $(MAKE) install ;; \
esac; \
done
+install: default install-libgl install-osmesa install-drivers
+
## NOT INSTALLED YET:
## $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GLES
## $(INSTALL) -m 644 include/GLES/*.h $(DESTDIR)$(INSTALL_DIR)/include/GLES
diff --git a/src/glx/x11/gl.pc.in b/src/mesa/gl.pc.in
index 4b144ffa4b..4b144ffa4b 100644
--- a/src/glx/x11/gl.pc.in
+++ b/src/mesa/gl.pc.in