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.

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 1cef21cdae44d0121200ad33c98e4eaf675a3a4a..8fa3700a04c3ebcbf823f81a9450901c952e7392 100644 (file)
--- 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 (file)
index 4b144ff..0000000
--- 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}

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 87c5e6126def2a44e4effac6717f6edfe7c642e5..695a4160942a98ec15db3d1005bda89cfd0cfd62 100644 (file)
--- 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/mesa/gl.pc.in b/src/mesa/gl.pc.in
new file mode 100644 (file)
index 0000000..4b144ff
--- /dev/null
+++ b/src/mesa/gl.pc.in
@@ -0,0 +1,11 @@
+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}