diff options
| author | Kristian Høgsberg <[email protected]> | 2010-05-02 10:14:53 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-05-02 10:14:53 -0400 |
| commit | 9fd5fa05122aa0cac0051fa92d1634bde43209db (patch) | |
| tree | 0b24a39fc2cec3195fefd879e3d39bcfa543961d | |
| parent | 74399d4af5b5ea793ce8318c10014a026cf81563 (diff) | |
Hook in install rules for es1 and es2
| -rw-r--r-- | configs/autoconf.in | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/mesa/Makefile | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 57a681a717d..2235abe73f8 100644 --- 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 8e25163f75b..01f511749c8 100644 --- 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 3ba7caa68a1..5403d28f328 100644 --- 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 = \ |