cogl-gles2: Install headers in cogl/ instead of in cogl2/

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Tomeu Vizoso 2012-08-16 15:17:18 +02:00 committed by Robert Bragg
parent 8dc035d8b3
commit 04348bda0b
2 changed files with 2 additions and 2 deletions

View File

@ -19,7 +19,7 @@ libcogl_gles2_la_LDFLAGS = \
-export-dynamic \ -export-dynamic \
-export-symbols-regex "^gl*" -export-symbols-regex "^gl*"
coglgles2includedir = $(includedir)/cogl2/cogl-gles2/GLES2 coglgles2includedir = $(includedir)/cogl/cogl-gles2/GLES2
coglgles2include_HEADERS = \ coglgles2include_HEADERS = \
GLES2/gl2.h \ GLES2/gl2.h \
GLES2/gl2ext.h \ GLES2/gl2ext.h \

View File

@ -523,7 +523,7 @@ coglincludedir = $(includedir)/cogl/cogl
coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h) coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-enum-types.h nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-enum-types.h
cogl_proto_includedir = $(includedir)/cogl2/cogl/gl-prototypes cogl_proto_includedir = $(includedir)/cogl/cogl/gl-prototypes
cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h) cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h)
dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters ../build/win32/gen-enums.bat dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters ../build/win32/gen-enums.bat