diff options
| author | Chia-I Wu <[email protected]> | 2010-05-06 10:46:51 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-05-08 14:55:57 +0800 |
| commit | 559046e7917e5b9e4226bb02e86da17e62f1385e (patch) | |
| tree | 2dcf0d029dfa3eda3d7444fbaaa398825fcc4f8d /src/mesa | |
| parent | bc918efb5643a6d23711b2ae6247be87615c847d (diff) | |
mapi: Add install rules for OpenGL ES.
Move the install rules for OpenGL ES from src/mesa/Makefile to mapi.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile | 46 | ||||
| -rw-r--r-- | src/mesa/glesv1_cm.pc.in | 12 | ||||
| -rw-r--r-- | src/mesa/glesv2.pc.in | 12 |
3 files changed, 0 insertions, 70 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 332063a507e..ba03840c8e7 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -101,12 +101,6 @@ 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 = \ @@ -126,22 +120,6 @@ gl_pcedit = sed \ gl.pc: gl.pc.in $(gl_pcedit) $< > $@ -glesv2_pcedit = sed \ - $(pcedit) \ - -e 's,@GLESv2_PC_LIB_PRIV@,$(GLESv2_PC_LIB_PRIV),' \ - -e 's,@GLESv2_LIB@,$(GLESv2_LIB),' - -glesv2.pc: glesv2.pc.in - $(glesv2_pcedit) $< > $@ - -glesv1_cm_pcedit = sed \ - $(pcedit) \ - -e 's,@GLESv1_CM_PC_LIB_PRIV@,$(GLESv1_CM_PC_LIB_PRIV),' \ - -e 's,@GLESv1_CM_LIB@,$(GLESv1_CM_LIB),' - -glesv1_cm.pc: glesv1_cm.pc.in - $(glesv1_cm_pcedit) $< > $@ - osmesa_pcedit = sed \ $(pcedit) \ -e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \ @@ -163,30 +141,6 @@ install-libgl: default gl.pc install-headers $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig -install-headers-es1: - $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GLES - $(INSTALL) -m 644 $(TOP)/include/GLES/*.h \ - $(DESTDIR)$(INSTALL_INC_DIR)/GLES - -install-es1: default glesv1_cm.pc install-headers-es1 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLESv1_CM_LIB_GLOB) \ - $(DESTDIR)$(INSTALL_LIB_DIR) - $(INSTALL) -m 644 glesv1_cm.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - -install-headers-es2: - $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GLES2 - $(INSTALL) -m 644 $(TOP)/include/GLES2/*.h \ - $(DESTDIR)$(INSTALL_INC_DIR)/GLES2 - -install-es2: default glesv2.pc install-headers-es2 - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GLESv2_LIB_GLOB) \ - $(DESTDIR)$(INSTALL_LIB_DIR) - $(INSTALL) -m 644 glesv2.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - install-osmesa: default osmesa.pc $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig diff --git a/src/mesa/glesv1_cm.pc.in b/src/mesa/glesv1_cm.pc.in deleted file mode 100644 index 291f5abf3f9..00000000000 --- a/src/mesa/glesv1_cm.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@INSTALL_DIR@ -exec_prefix=${prefix} -libdir=@INSTALL_LIB_DIR@ -includedir=@INSTALL_INC_DIR@ - -Name: glesv1_cm -Description: Mesa OpenGL ES 1.1 CM library -Requires.private: @GLESv1_CM_PC_REQ_PRIV@ -Version: @VERSION@ -Libs: -L${libdir} -l@GLESv1_CM_LIB@ -Libs.private: @GLESv1_CM_PC_LIB_PRIV@ -Cflags: -I${includedir} @GLESv1_CM_PC_CFLAGS@ diff --git a/src/mesa/glesv2.pc.in b/src/mesa/glesv2.pc.in deleted file mode 100644 index 3b747cbee77..00000000000 --- a/src/mesa/glesv2.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@INSTALL_DIR@ -exec_prefix=${prefix} -libdir=@INSTALL_LIB_DIR@ -includedir=@INSTALL_INC_DIR@ - -Name: glesv2 -Description: Mesa OpenGL ES 2.0 library -Requires.private: @GLESv2_PC_REQ_PRIV@ -Version: @VERSION@ -Libs: -L${libdir} -l@GLESv2_LIB@ -Libs.private: @GLESv2_PC_LIB_PRIV@ -Cflags: -I${includedir} @GLESv2_PC_CFLAGS@ |