Hook in install rules for es1 and es2

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 57a681a717d4c8647c3520404fe5937b0eca3e7b..2235abe73f89972465a0d9fe188d710569ea31c2 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -15,6 +15,7 @@ ASM_FLAGS = @ASM_FLAGS@
 PIC_FLAGS = @PIC_FLAGS@
 DEFINES = @DEFINES@
 API_DEFINES = @API_DEFINES@
+APIS = @APIS@
 CFLAGS = @CPPFLAGS@ @CFLAGS@ \
        $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
 CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \

diff --git a/configure.ac b/configure.ac
index 8e25163f75b7b79d07daa0d50c68c3d5dde4b427..01f511749c8aac1006e6280a9a518e0c86316446 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -743,21 +743,26 @@ AC_ARG_ENABLE([gles2],
     [enable_gles2=no])
 
 API_DEFINES=""
+APIS=""
 if test "x$enable_opengl" = xno; then
     API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
 else
     API_DEFINES="$API_DEFINES -DFEATURE_GL=1"
+    APIS="$APIS gl"
 fi
 if test "x$enable_gles1" = xyes; then
     API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"
+    APIS="$APIS es1"
 fi
 if test "x$enable_gles2" = xyes; then
     API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"
+    APIS="$APIS es2"
 fi
 if test "x$enable_gles1" = xyes -o "x$enable_gles2"; then
     SRC_DIRS="$SRC_DIRS gles"
 fi
 AC_SUBST([API_DEFINES])
+AC_SUBST([APIS])
 
 dnl If $with_dri_drivers is yes, directories will be added through
 dnl platform checks

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 3ba7caa68a1e70a68ed5920c05ef3de8e3f51aaf..5403d28f32856cce5952d6987e26693a70af31ed 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -106,6 +106,12 @@ install: default
            dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \
            *)      $(MAKE) install-libgl || exit 1 ;; \
          esac ; \
+       done; \
+       for api in $(APIS) ; do \
+         case "$$api" in \
+           es1) $(MAKE) install-es1 || exit 1;; \
+           es2) $(MAKE) install-es2 || exit 1;; \
+         esac; \
        done
 
 pcedit = \