isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: make library private to mutter

Browse Source
This commit is contained in:
Rui Matos 2016-04-11 20:34:37 +02:00
parent 335643ee86
commit e6b14a36c5
18 changed files with 79 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cogl-gles2/Makefile.am
View File

@ -2,7 +2,8 @@
NULL = NULL =
lib_LTLIBRARIES = libcogl-gles2.la mutterlibdir = $(libdir)/mutter
mutterlib_LTLIBRARIES = libmutter-cogl-gles2.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
@ -10,21 +11,21 @@ AM_CPPFLAGS = \
AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
libcogl_gles2_la_SOURCES = cogl-gles2-api.c libmutter_cogl_gles2_la_SOURCES = cogl-gles2-api.c
libcogl_gles2_la_LDFLAGS = \ libmutter_cogl_gles2_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-rpath $(mutterlibdir) \
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
-export-dynamic \ -export-dynamic \
-export-symbols-regex "^gl*" -export-symbols-regex "^gl*"
coglgles2includedir = $(includedir)/cogl/cogl-gles2/GLES2 coglgles2includedir = $(includedir)/mutter/cogl/cogl-gles2/GLES2
coglgles2include_HEADERS = \ coglgles2include_HEADERS = \
GLES2/gl2.h \ GLES2/gl2.h \
GLES2/gl2ext.h \ GLES2/gl2ext.h \
GLES2/gl2platform.h GLES2/gl2platform.h
pc_files = cogl-gles2-1.0.pc \ pc_files = mutter-cogl-gles2-1.0.pc
cogl-gles2-2.0-experimental.pc
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files) pkgconfig_DATA = $(pc_files)

13
cogl-gles2/cogl-gles2-2.0-experimental.pc.in
View File

@ -1,13 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
apiversion=@COGL_API_VERSION@
requires=cogl-2.0-experimental
Name: CoglGLES2
Description: Cogl OpenGL ES 2.0 frontend api
Version: @COGL_VERSION@
Libs: -L${libdir} -lcogl-gles2
Cflags: -I${includedir}/cogl
Requires: ${requires}

8
cogl-gles2/cogl-gles2-1.0.pc.in → cogl-gles2/mutter-cogl-gles2-1.0.pc.in
View File

@ -1,13 +1,13 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@/mutter
includedir=@includedir@ includedir=@includedir@/mutter
apiversion=1.0 apiversion=1.0
requires=@COGL_PKG_REQUIRES@ cogl-1.0 requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
Name: Cogl Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @COGL_1_VERSION@ Version: @COGL_1_VERSION@
Libs: -L${libdir} -lcogl-gles2 Libs: -L${libdir} -lmutter-cogl-gles2
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

33
cogl-pango/Makefile.am
View File

@ -22,14 +22,16 @@ source_h_priv = \
cogl-pango-pipeline-cache.h \ cogl-pango-pipeline-cache.h \
$(NULL) $(NULL)
lib_LTLIBRARIES = libcogl-pango.la mutterlibdir = $(libdir)/mutter
mutterlib_LTLIBRARIES = libmutter-cogl-pango.la
libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv) libmutter_cogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) libmutter_cogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
libcogl_pango_la_LIBADD = $(top_builddir)/cogl/libcogl.la libmutter_cogl_pango_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl.la
libcogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) libmutter_cogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
libcogl_pango_la_LDFLAGS = \ libmutter_cogl_pango_la_LDFLAGS = \
-export-dynamic \ -export-dynamic \
-rpath $(mutterlibdir) \
-export-symbols-regex "^cogl_pango_.*" \ -export-symbols-regex "^cogl_pango_.*" \
-no-undefined \ -no-undefined \
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
@ -43,16 +45,15 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) -I$(top_builddir)
cogl_pangoheadersdir = $(includedir)/cogl/cogl-pango cogl_base_includedir = $(includedir)/mutter
cogl_pangoheadersdir = $(cogl_base_includedir)/cogl/cogl-pango
cogl_pangoheaders_HEADERS = $(source_h) cogl_pangoheaders_HEADERS = $(source_h)
pc_files = cogl-pango-1.0.pc \ pc_files = mutter-cogl-pango-1.0.pc
cogl-pango-$(COGL_API_VERSION)-experimental.pc
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files) pkgconfig_DATA = $(pc_files)
EXTRA_DIST += cogl-pango.pc.in
DISTCLEANFILES += $(pc_files) DISTCLEANFILES += $(pc_files)
EXTRA_DIST += cogl-pango.symbols EXTRA_DIST += cogl-pango.symbols
@ -64,11 +65,11 @@ INTROSPECTION_GIRS =
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
INTROSPECTION_COMPILER_ARGS=--includedir=$(top_builddir)/cogl INTROSPECTION_COMPILER_ARGS=--includedir=$(top_builddir)/cogl
CoglPango-1.0.gir: libcogl-pango.la Makefile CoglPango-1.0.gir: libmutter-cogl-pango.la Makefile
CoglPango_1_0_gir_NAMESPACE = CoglPango CoglPango_1_0_gir_NAMESPACE = CoglPango
CoglPango_1_0_gir_VERSION = 1.0 CoglPango_1_0_gir_VERSION = 1.0
CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl.la libmutter-cogl-pango.la
CoglPango_1_0_gir_FILES = $(source_h) $(source_c) CoglPango_1_0_gir_FILES = $(source_h) $(source_c)
CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0 CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
@ -80,11 +81,11 @@ CoglPango_1_0_gir_SCANNERFLAGS = \
--c-include='cogl-pango/cogl-pango.h' \ --c-include='cogl-pango/cogl-pango.h' \
--include-uninstalled=$(top_builddir)/cogl/Cogl-1.0.gir --include-uninstalled=$(top_builddir)/cogl/Cogl-1.0.gir
CoglPango-2.0.gir: libcogl-pango.la Makefile CoglPango-2.0.gir: libmutter-cogl-pango.la Makefile
CoglPango_2_0_gir_NAMESPACE = CoglPango CoglPango_2_0_gir_NAMESPACE = CoglPango
CoglPango_2_0_gir_VERSION = 2.0 CoglPango_2_0_gir_VERSION = 2.0
CoglPango_2_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la CoglPango_2_0_gir_LIBS = $(top_builddir)/cogl/libmutter-cogl.la libmutter-cogl-pango.la
CoglPango_2_0_gir_FILES = $(source_h) $(source_c) CoglPango_2_0_gir_FILES = $(source_h) $(source_c)
CoglPango_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) CoglPango_2_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
CoglPango_2_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0 CoglPango_2_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
@ -98,10 +99,10 @@ CoglPango_2_0_gir_SCANNERFLAGS = \
INTROSPECTION_GIRS += CoglPango-1.0.gir CoglPango-2.0.gir INTROSPECTION_GIRS += CoglPango-1.0.gir CoglPango-2.0.gir
girdir = $(datadir)/gir-1.0 girdir = $(mutterlibdir)
gir_DATA = $(INTROSPECTION_GIRS) gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0 typelibdir = $(mutterlibdir)
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA) CLEANFILES += $(gir_DATA) $(typelib_DATA)

13
cogl-pango/cogl-pango-2.0-experimental.pc.in
View File

@ -1,13 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
apiversion=@COGL_API_VERSION@
requires=@COGL_PKG_REQUIRES@ cogl-2.0-experimental
Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @COGL_1_VERSION@
Libs: -L${libdir} -lcoglpango
Cflags: -I${includedir}/cogl
Requires: ${requires}

13
cogl-pango/cogl-pango.pc.in
View File

@ -1,13 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
apiversion=@COGL_API_VERSION@
requires=@COGL_PKG_REQUIRES@ @COGL_PANGO_PKG_REQUIRES@
Name: Cogl
Description: An pango integration library for Cogl
Version: @COGL_VERSION@
Libs: -L${libdir} -lcogl-pango
Cflags: -I${includedir}/cogl -DCOGL_ENABLE_EXPERIMENTAL_2_0_API
Requires: ${requires}

8
cogl-pango/cogl-pango-1.0.pc.in → cogl-pango/mutter-cogl-pango-1.0.pc.in
View File

@ -1,13 +1,13 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@/mutter
includedir=@includedir@ includedir=@includedir@/mutter
apiversion=1.0 apiversion=1.0
requires=@COGL_PKG_REQUIRES@ cogl-1.0 requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
Name: Cogl Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @COGL_1_VERSION@ Version: @COGL_1_VERSION@
Libs: -L${libdir} -lcogl-pango Libs: -L${libdir} -lmutter-cogl-pango
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

24
cogl-path/Makefile.am
View File

@ -66,19 +66,20 @@ glib_enum_c = cogl-path-enum-types.c
glib_enum_headers = $(source_1_x_h) glib_enum_headers = $(source_1_x_h)
include $(top_srcdir)/build/autotools/Makefile.am.enums include $(top_srcdir)/build/autotools/Makefile.am.enums
lib_LTLIBRARIES = libcogl-path.la mutterlibdir = $(libdir)/mutter
mutterlib_LTLIBRARIES = libmutter-cogl-path.la
libcogl_path_la_SOURCES = $(source_c) $(source_h) libmutter_cogl_path_la_SOURCES = $(source_c) $(source_h)
nodist_libcogl_path_la_SOURCES = $(BUILT_SOURCES) nodist_libmutter_cogl_path_la_SOURCES = $(BUILT_SOURCES)
libcogl_path_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) libmutter_cogl_path_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
libcogl_path_la_LIBADD = $(top_builddir)/cogl/libcogl.la libmutter_cogl_path_la_LIBADD = $(top_builddir)/cogl/libmutter-cogl.la
libcogl_path_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) libmutter_cogl_path_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
libcogl_path_la_LDFLAGS = \ libmutter_cogl_path_la_LDFLAGS = \
-export-dynamic \ -export-dynamic \
-export-symbols-regex "^(cogl|cogl2)_(framebuffer|path|is|clip|[sg]et)_.*" \ -export-symbols-regex "^(cogl|cogl2)_(framebuffer|path|is|clip|[sg]et)_.*" \
-no-undefined \ -no-undefined \
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
-rpath $(libdir) -rpath $(mutterlibdir)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DCOGL_COMPILATION \ -DCOGL_COMPILATION \
@ -90,15 +91,14 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) -I$(top_builddir)
cogl_pathheadersdir = $(includedir)/cogl/cogl-path cogl_base_includedir = $(includedir)/mutter
cogl_pathheadersdir = $(cogl_base_includedir)/cogl/cogl-path
cogl_pathheaders_HEADERS = $(source_h) cogl_pathheaders_HEADERS = $(source_h)
nodist_cogl_pathheaders_HEADERS = cogl-path-enum-types.h nodist_cogl_pathheaders_HEADERS = cogl-path-enum-types.h
pc_files = cogl-path-1.0.pc \ pc_files = mutter-cogl-path-1.0.pc
cogl-path-2.0-experimental.pc
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files) pkgconfig_DATA = $(pc_files)
EXTRA_DIST += cogl-path.pc.in
DISTCLEANFILES += $(pc_files) DISTCLEANFILES += $(pc_files)

13
cogl-path/cogl-path-2.0-experimental.pc.in
View File

@ -1,13 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
apiversion=@COGL_API_VERSION@
requires=@COGL_PKG_REQUIRES@ cogl-2.0-experimental
Name: Cogl
Description: A 2D path drawing library for Cogl
Version: @COGL_1_VERSION@
Libs: -L${libdir} -lcogl-path
Cflags: -I${includedir}/cogl
Requires: ${requires}

13
cogl-path/cogl-path.pc.in
View File

@ -1,13 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
apiversion=@COGL_API_VERSION@
requires=@COGL_PKG_REQUIRES@
Name: Cogl
Description: A 2D path drawing library for Cogl
Version: @COGL_VERSION@
Libs: -L${libdir} -lcogl-path
Cflags: -I${includedir}/cogl
Requires: ${requires}

8
cogl-path/cogl-path-1.0.pc.in → cogl-path/mutter-cogl-path-1.0.pc.in
View File

@ -1,13 +1,13 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@/mutter
includedir=@includedir@ includedir=@includedir@/mutter
apiversion=1.0 apiversion=1.0
requires=@COGL_PKG_REQUIRES@ cogl-1.0 requires=@COGL_PKG_REQUIRES@ mutter-cogl-1.0
Name: Cogl Name: Cogl
Description: A 2D path drawing library for Cogl Description: A 2D path drawing library for Cogl
Version: @COGL_1_VERSION@ Version: @COGL_1_VERSION@
Libs: -L${libdir} -lcogl-path Libs: -L${libdir} -lmutter-cogl-path
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

49
cogl/Makefile.am
View File

@ -10,9 +10,6 @@ EXTRA_DIST =
CLEANFILES = CLEANFILES =
DISTCLEANFILES = DISTCLEANFILES =
noinst_LTLIBRARIES =
lib_LTLIBRARIES =
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
@ -44,22 +41,11 @@ BUILT_SOURCES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
DISTCLEANFILES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h DISTCLEANFILES += cogl-defines.h cogl-egl-defines.h cogl-gl-header.h
EXTRA_DIST += cogl-defines.h.in cogl-egl-defines.h.in cogl-gl-header.h.in EXTRA_DIST += cogl-defines.h.in cogl-egl-defines.h.in cogl-gl-header.h.in
# Note: The cogl-1.0/cogl-gl-1.0 files are essentially for pc_files = mutter-cogl-1.0.pc
# compatability only. I'm not really sure who could possibly be using
# them so we may decide to remove them entirely at some point.
pc_files = \
cogl-1.0.pc \
cogl-gl-1.0.pc
pc_files += cogl-$(COGL_API_VERSION)-experimental.pc
cogl-gl-1.0.pc: cogl-1.0.pc
$(QUIET_GEN)cp -f $< $(@F)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files) pkgconfig_DATA = $(pc_files)
EXTRA_DIST += cogl-1.0.pc.in cogl-$(COGL_API_VERSION)-experimental.pc.in
DISTCLEANFILES += $(pc_files) DISTCLEANFILES += $(pc_files)
cogl_deprecated_h = \ cogl_deprecated_h = \
@ -474,22 +460,24 @@ glib_enum_c = cogl-enum-types.c
glib_enum_headers = $(cogl_1_public_h) glib_enum_headers = $(cogl_1_public_h)
include $(top_srcdir)/build/autotools/Makefile.am.enums include $(top_srcdir)/build/autotools/Makefile.am.enums
lib_LTLIBRARIES += libcogl.la mutterlibdir = $(libdir)/mutter
mutterlib_LTLIBRARIES = libmutter-cogl.la
libcogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) libmutter_cogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
if UNIT_TESTS if UNIT_TESTS
libcogl_la_LIBADD += $(top_builddir)/test-fixtures/libtest-fixtures.la libmutter_cogl_la_LIBADD += $(top_builddir)/test-fixtures/libtest-fixtures.la
endif endif
# XXX: The aim is to eventually get rid of all private API exports # XXX: The aim is to eventually get rid of all private API exports
# for cogl-pango. # for cogl-pango.
libcogl_la_LDFLAGS = \ libmutter_cogl_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
-export-dynamic \ -export-dynamic \
-rpath $(mutterlibdir) \
-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_).*" -export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_).*"
libcogl_la_SOURCES = $(cogl_sources_c) libmutter_cogl_la_SOURCES = $(cogl_sources_c)
nodist_libcogl_la_SOURCES = $(BUILT_SOURCES) nodist_libmutter_cogl_la_SOURCES = $(BUILT_SOURCES)
# Cogl installed headers # Cogl installed headers
cogl_headers = \ cogl_headers = \
@ -498,14 +486,15 @@ cogl_headers = \
cogl-pango.h \ cogl-pango.h \
$(NULL) $(NULL)
cogldeprecatedincludedir = $(includedir)/cogl/cogl/deprecated cogl_base_includedir = $(includedir)/mutter
cogldeprecatedincludedir = $(cogl_base_includedir)/cogl/cogl/deprecated
cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h) cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h)
coglincludedir = $(includedir)/cogl/cogl coglincludedir = $(cogl_base_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)/cogl/cogl/gl-prototypes cogl_proto_includedir = $(cogl_base_includedir)/cogl/cogl/gl-prototypes
cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h) cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h)
EXTRA_DIST += \ EXTRA_DIST += \
@ -516,21 +505,21 @@ EXTRA_DIST += \
INTROSPECTION_GIRS = INTROSPECTION_GIRS =
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
Cogl-1.0.gir: libcogl.la Makefile Cogl-1.0.gir: libmutter-cogl.la Makefile
Cogl_1_0_gir_NAMESPACE = Cogl Cogl_1_0_gir_NAMESPACE = Cogl
Cogl_1_0_gir_VERSION = 1.0 Cogl_1_0_gir_VERSION = 1.0
Cogl_1_0_gir_LIBS = libcogl.la Cogl_1_0_gir_LIBS = libmutter-cogl.la
if UNIT_TESTS if UNIT_TESTS
Cogl_1_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la Cogl_1_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
endif endif
Cogl_1_0_gir_FILES = $(cogl_1_public_h) cogl-enum-types.h Cogl_1_0_gir_FILES = $(cogl_1_public_h) cogl-enum-types.h
Cogl-2.0.gir: libcogl.la Makefile Cogl-2.0.gir: libmutter-cogl.la Makefile
Cogl_2_0_gir_NAMESPACE = Cogl Cogl_2_0_gir_NAMESPACE = Cogl
Cogl_2_0_gir_VERSION = 2.0 Cogl_2_0_gir_VERSION = 2.0
Cogl_2_0_gir_LIBS = libcogl.la Cogl_2_0_gir_LIBS = libmutter-cogl.la
if UNIT_TESTS if UNIT_TESTS
Cogl_2_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la Cogl_2_0_gir_LIBS += $(top_builddir)/test-fixtures/libtest-fixtures.la
endif endif
@ -548,10 +537,10 @@ Cogl_2_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h' --symbol-prefix
INTROSPECTION_GIRS += Cogl-1.0.gir Cogl-2.0.gir INTROSPECTION_GIRS += Cogl-1.0.gir Cogl-2.0.gir
girdir = $(datadir)/gir-1.0 girdir = $(mutterlibdir)
gir_DATA = $(INTROSPECTION_GIRS) gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0 typelibdir = $(mutterlibdir)
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA) CLEANFILES += $(gir_DATA) $(typelib_DATA)

13
cogl/cogl-2.0-experimental.pc.in
View File

@ -1,13 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
apiversion=@COGL_API_VERSION@
requires=@COGL_PKG_REQUIRES@
Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @COGL_VERSION@
Libs: -L${libdir} -lcogl
Cflags: -I${includedir}/cogl
Requires: ${requires}

6
cogl/cogl-1.0.pc.in → cogl/mutter-cogl-1.0.pc.in
View File

@ -1,13 +1,13 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@/mutter
includedir=@includedir@ includedir=@includedir@/mutter
apiversion=1.0 apiversion=1.0
requires=@COGL_PKG_REQUIRES@ requires=@COGL_PKG_REQUIRES@
Name: Cogl Name: Cogl
Description: An object oriented GL/GLES Abstraction/Utility Layer Description: An object oriented GL/GLES Abstraction/Utility Layer
Version: @COGL_1_VERSION@ Version: @COGL_1_VERSION@
Libs: -L${libdir} -lcogl Libs: -L${libdir} -lmutter-cogl
Cflags: -I${includedir}/cogl Cflags: -I${includedir}/cogl
Requires: ${requires} Requires: ${requires}

12
configure.ac
View File

@ -953,20 +953,16 @@ AC_OUTPUT(
Makefile Makefile
test-fixtures/Makefile test-fixtures/Makefile
cogl/Makefile cogl/Makefile
cogl/cogl-1.0.pc cogl/mutter-cogl-1.0.pc
cogl/cogl-2.0-experimental.pc
cogl/cogl-defines.h cogl/cogl-defines.h
cogl/cogl-gl-header.h cogl/cogl-gl-header.h
cogl/cogl-egl-defines.h cogl/cogl-egl-defines.h
cogl-pango/Makefile cogl-pango/Makefile
cogl-pango/cogl-pango-1.0.pc cogl-pango/mutter-cogl-pango-1.0.pc
cogl-pango/cogl-pango-2.0-experimental.pc
cogl-path/Makefile cogl-path/Makefile
cogl-path/cogl-path-1.0.pc cogl-path/mutter-cogl-path-1.0.pc
cogl-path/cogl-path-2.0-experimental.pc
cogl-gles2/Makefile cogl-gles2/Makefile
cogl-gles2/cogl-gles2-1.0.pc cogl-gles2/mutter-cogl-gles2-1.0.pc
cogl-gles2/cogl-gles2-2.0-experimental.pc
tests/Makefile tests/Makefile
tests/config.env tests/config.env
tests/conform/Makefile tests/conform/Makefile

4
tests/conform/Makefile.am
View File

@ -131,10 +131,10 @@ AM_CPPFLAGS += \
test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
test_conformance_LDADD = \ test_conformance_LDADD = \
$(COGL_DEP_LIBS) \ $(COGL_DEP_LIBS) \
$(top_builddir)/cogl/libcogl.la \ $(top_builddir)/cogl/libmutter-cogl.la \
$(LIBM) $(LIBM)
if BUILD_COGL_PATH if BUILD_COGL_PATH
test_conformance_LDADD += $(top_builddir)/cogl-path/libcogl-path.la test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path.la
endif endif
test_conformance_LDFLAGS = -export-dynamic test_conformance_LDFLAGS = -export-dynamic

2
tests/micro-perf/Makefile.am
View File

@ -17,7 +17,7 @@ AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
common_ldadd = \ common_ldadd = \
$(COGL_DEP_LIBS) \ $(COGL_DEP_LIBS) \
$(top_builddir)/cogl/libcogl.la \ $(top_builddir)/cogl/libmutter-cogl.la \
$(LIBM) $(LIBM)
test_journal_SOURCES = test-journal.c test_journal_SOURCES = test-journal.c

4
tests/unit/Makefile.am
View File

@ -13,7 +13,7 @@ wrappers: stamp-test-unit
@true @true
stamp-test-unit: Makefile test-unit$(EXEEXT) stamp-test-unit: Makefile test-unit$(EXEEXT)
@mkdir -p wrappers @mkdir -p wrappers
. $(top_builddir)/cogl/libcogl.la ; \ . $(top_builddir)/cogl/libmutter-cogl.la ; \
$(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \ $(NM) $(top_builddir)/cogl/.libs/"$$dlname"| \
grep '[DR] _\?unit_test_'|sed 's/.\+ [DR] _\?//' > unit-tests grep '[DR] _\?unit_test_'|sed 's/.\+ [DR] _\?//' > unit-tests
@chmod +x $(top_srcdir)/tests/test-launcher.sh @chmod +x $(top_srcdir)/tests/test-launcher.sh
@ -62,7 +62,7 @@ AM_CPPFLAGS += \
test_unit_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) test_unit_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)
test_unit_LDADD = \ test_unit_LDADD = \
$(COGL_DEP_LIBS) \ $(COGL_DEP_LIBS) \
$(top_builddir)/cogl/libcogl.la \ $(top_builddir)/cogl/libmutter-cogl.la \
$(LIBM) $(LIBM)
test_unit_LDFLAGS = -export-dynamic test_unit_LDFLAGS = -export-dynamic