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
0da00392e6
mutter/cogl-pango/Makefile.am

111 lines
3.2 KiB
Makefile
Raw Normal View History

[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
include $(top_srcdir)/build/autotools/Makefile.am.silent
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
NULL =
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST =
[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
source_c = \
cogl-pango: Use a seperate cache of pipelines Instead of creating just two materials (one for texturing and one for solid primitives) the pango renderer now maintains a cache of pipelines. The display list can request a pipeline for a texture from the cache. The same pipeline cache is used by all display lists so that the pipelines can be shared. This avoids changing the texture on the material during a paint run.
2010-02-26 07:38:22 -05:00
cogl-pango-display-list.c \
cogl-pango-fontmap.c \
cogl-pango-render.c \
cogl-pango-glyph-cache.c \
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
cogl-pango-pipeline-cache.c \
$(NULL)
[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
source_h = cogl-pango.h
source_h_priv = \
cogl-pango: Use a seperate cache of pipelines Instead of creating just two materials (one for texturing and one for solid primitives) the pango renderer now maintains a cache of pipelines. The display list can request a pipeline for a texture from the cache. The same pipeline cache is used by all display lists so that the pipelines can be shared. This avoids changing the texture on the material during a paint run.
2010-02-26 07:38:22 -05:00
cogl-pango-display-list.h \
cogl-pango-private.h \
cogl-pango-glyph-cache.h \
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
cogl-pango-pipeline-cache.h \
$(NULL)
[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
consistently refer to cogl-pango as "cogl-pango" This renames the pango directory to cogl-pango and it renames the installed library to libcogl-pango instead of libcoglpango.
2011-05-05 17:04:07 -04:00
lib_LTLIBRARIES = libcogl-pango.la
[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
consistently refer to cogl-pango as "cogl-pango" This renames the pango directory to cogl-pango and it renames the installed library to libcogl-pango instead of libcoglpango.
2011-05-05 17:04:07 -04:00
libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
build: only have libcogl-pango depend on pango Only cogl-pango needs a dependency on pangocairo so we are now careful to separate the pangocairo pkg-config flags from the others so we can avoid having libcogl builds refer to them. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2011-08-02 09:14:06 -04:00
libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
cogl-pango: prevent linking to system cogl during make install At the moment, on make install, libcogl-pango will link to the version of libcogl that is installed system wide. This leads to interesting problems when the version installed system wide is incompatible with the version of cogl being built. E.g., when building cogl-1.7.4 (with --enable-cogl-pango and --prefix=/usr) on a system that has cogl-1.7.2 installed in /usr: $ make [...] $ ldd cogl-pango/.libs/libcogl-pango.so | grep cogl libcogl.so.2 => /var/tmp/cogl-1.7.4/cogl/.libs/libcogl.so.2 (0x00007eff4bfb2000) $ make DESTDIR=/var/tmp/cogl-1.7.4/dest install [...] $ ldd /var/tmp/cogl-1.7.4/dest/usr/lib64/libcogl-pango.so | grep cogl libcogl.so.1 => /usr/lib64/libcogl.so.1 (0x00007f4647747000) This problem can be avoided by reordering libcogl_pango_la_LIBADD to ensure that during make installs' relinking phase, libtool looks at the libcogl in the build directory before the system wide libcogl. https://bugzilla.gnome.org/show_bug.cgi?id=655026 Reviewed-By: Robert Bragg <robert@linux.intel.com> Reviewed-By: Emmanuele Bassi <ebassi@linux.intel.com>
2011-07-21 01:09:04 -04:00
libcogl_pango_la_LIBADD = $(top_builddir)/cogl/libcogl.la
build: only have libcogl-pango depend on pango Only cogl-pango needs a dependency on pangocairo so we are now careful to separate the pangocairo pkg-config flags from the others so we can avoid having libcogl builds refer to them. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2011-08-02 09:14:06 -04:00
libcogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
consistently refer to cogl-pango as "cogl-pango" This renames the pango directory to cogl-pango and it renames the installed library to libcogl-pango instead of libcoglpango.
2011-05-05 17:04:07 -04:00
libcogl_pango_la_LDFLAGS = \
Adds the ability to build Cogl standalone This adds an autogen.sh, configure.ac and build/autotool files etc under clutter/cogl and makes some corresponding Makefile.am changes that make it possible to build and install Cogl as a standalone library. Some notable things about this are: A standalone installation of Cogl installs 3 pkg-config files; cogl-1.0.pc, cogl-gl-1.0.pc and cogl-2.0.pc. The second is only for compatibility with what clutter installed though I'm not sure that anything uses it so maybe we could remove it. cogl-1.0.pc is what Clutter would use if it were updated to build against a standalone cogl library. cogl-2.0.pc is what you would use if you were writing a standalone Cogl application. A standalone installation results in two libraries currently, libcogl.so and libcogl-pango.so. Notably we don't include a major number in the sonames because libcogl supports two major API versions; 1.x as used by Clutter and the experimental 2.x API for standalone applications. Parallel installation of later versions e.g. 3.x and beyond will be supportable either with new sonames or if we can maintain ABI then we'll continue to share libcogl.so. The headers are similarly not installed into a directory with a major version number since the same headers are shared to export the 1.x and 2.x APIs (The only difference is that cogl-2.0.pc ensures that -DCOGL_ENABLE_EXPERIMENTAL_2_0_API is used). Parallel installation of later versions is not precluded though since we can either continue sharing or later add a major version suffix.
2011-02-09 21:32:11 -05:00
-export-dynamic \
cogl-pango: Add a missing backslash in the Makefile There was a missing backslash in the LDFLAGS for libcogl-pango2. This was stopping it having the right library version information and the library would have the wrong filename. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit cf3d2b3de84d4e1e90b83cf3f69653f38997ef97)
2013-02-19 12:56:31 -05:00
-export-symbols-regex "^cogl_pango_.*" \
Adds the ability to build Cogl standalone This adds an autogen.sh, configure.ac and build/autotool files etc under clutter/cogl and makes some corresponding Makefile.am changes that make it possible to build and install Cogl as a standalone library. Some notable things about this are: A standalone installation of Cogl installs 3 pkg-config files; cogl-1.0.pc, cogl-gl-1.0.pc and cogl-2.0.pc. The second is only for compatibility with what clutter installed though I'm not sure that anything uses it so maybe we could remove it. cogl-1.0.pc is what Clutter would use if it were updated to build against a standalone cogl library. cogl-2.0.pc is what you would use if you were writing a standalone Cogl application. A standalone installation results in two libraries currently, libcogl.so and libcogl-pango.so. Notably we don't include a major number in the sonames because libcogl supports two major API versions; 1.x as used by Clutter and the experimental 2.x API for standalone applications. Parallel installation of later versions e.g. 3.x and beyond will be supportable either with new sonames or if we can maintain ABI then we'll continue to share libcogl.so. The headers are similarly not installed into a directory with a major version number since the same headers are shared to export the 1.x and 2.x APIs (The only difference is that cogl-2.0.pc ensures that -DCOGL_ENABLE_EXPERIMENTAL_2_0_API is used). Parallel installation of later versions is not precluded though since we can either continue sharing or later add a major version suffix.
2011-02-09 21:32:11 -05:00
-no-undefined \
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
build: update to build with automake 1.13 This make autogen.sh look for automake-1.13 and also updates all Makefile.am files to no longer use the INCLUDES variable which automake 1.13 warns is deprecated by AM_CPPFLAGS. https://bugzilla.gnome.org/show_bug.cgi?id=690891 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5de5569e960102afe979a5f2f0403e1defebca62)
2013-01-17 17:56:41 -05:00
AM_CPPFLAGS = \
Mass rename CLUTTER_COMPILATION to COGL_COMPILATION Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)
2012-06-20 13:49:08 -04:00
-DCOGL_COMPILATION \
[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
-DG_LOG_DOMAIN=\"CoglPango\" \
Dynamically load the GL or GLES library The GL or GLES library is now dynamically loaded by the CoglRenderer so that it can choose between GL, GLES1 and GLES2 at runtime. The library is loaded by the renderer because it needs to be done before calling eglInitialize. There is a new environment variable called COGL_DRIVER to choose between gl, gles1 or gles2. The #ifdefs for HAVE_COGL_GL, HAVE_COGL_GLES and HAVE_COGL_GLES2 have been changed so that they don't assume the ifdefs are mutually exclusive. They haven't been removed entirely so that it's possible to compile the GLES backends without the the enums from the GL headers. When using GLX the winsys additionally dynamically loads libGL because that also contains the GLX API. It can't be linked in directly because that would probably conflict with the GLES API if the EGL is selected. When compiling with EGL support the library links directly to libEGL because it doesn't contain any GL API so it shouldn't have any conflicts. When building for WGL or OSX Cogl still directly links against the GL API so there is a #define in config.h so that Cogl won't try to dlopen the library. Cogl-pango previously had a #ifdef to detect when the GL backend is used so that it can sneakily pass GL_QUADS to cogl_vertex_buffer_draw. This is now changed so that it queries the CoglContext for the backend. However to get this to work Cogl now needs to export the _cogl_context_get_default symbol and cogl-pango needs some extra -I flags to so that it can include cogl-context-private.h
2011-07-07 15:44:56 -04:00
-I$(top_srcdir)/cogl \
cogl-flags: Add some macros to help iterate the bits This adds some macros to iterate over all the bits set in an array of flags. The macros are a bit awkward because it tries to avoid using a callback pointer so that the code is inlined. cogl_bitmask is now using these macros as well so that the logic can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-02 09:41:32 -04:00
-I$(top_builddir)/cogl \
Dynamically load the GL or GLES library The GL or GLES library is now dynamically loaded by the CoglRenderer so that it can choose between GL, GLES1 and GLES2 at runtime. The library is loaded by the renderer because it needs to be done before calling eglInitialize. There is a new environment variable called COGL_DRIVER to choose between gl, gles1 or gles2. The #ifdefs for HAVE_COGL_GL, HAVE_COGL_GLES and HAVE_COGL_GLES2 have been changed so that they don't assume the ifdefs are mutually exclusive. They haven't been removed entirely so that it's possible to compile the GLES backends without the the enums from the GL headers. When using GLX the winsys additionally dynamically loads libGL because that also contains the GLX API. It can't be linked in directly because that would probably conflict with the GLES API if the EGL is selected. When compiling with EGL support the library links directly to libEGL because it doesn't contain any GL API so it shouldn't have any conflicts. When building for WGL or OSX Cogl still directly links against the GL API so there is a #define in config.h so that Cogl won't try to dlopen the library. Cogl-pango previously had a #ifdef to detect when the GL backend is used so that it can sneakily pass GL_QUADS to cogl_vertex_buffer_draw. This is now changed so that it queries the CoglContext for the backend. However to get this to work Cogl now needs to export the _cogl_context_get_default symbol and cogl-pango needs some extra -I flags to so that it can include cogl-context-private.h
2011-07-07 15:44:56 -04:00
-I$(top_srcdir)/cogl/winsys \
cogl-pango/Makefile.am: Add $(top_builddir) to INCLUDES Some of the sources need to include <cogl/cogl-defines.h> which is in the build directory. I think this directory gets added to the include flags anyway by something so the actual building works but when building the introspection data out of tree it was not included so it failed to scan.
2011-05-06 13:23:04 -04:00
-I$(top_srcdir) \
-I$(top_builddir)
[cogl] move clutter/pango to clutter/cogl/pango As part of the re-organisation of Cogl; move clutter/pango to be part of the cogl sub-project.
2009-07-29 12:21:07 -04:00
deprecate #include <cogl/cogl-pango.h> cogl-pango is conceptually a separate library so it doesn't seem appropriate to bundle the headers with all the other cogl headers. Also in-tree the headers live in a cogl-pango directory so if we want examples that can include cogl-pango consistently when built in or out of tree using the convention #include <cogl-pango/cogl-pango.h> makes that easy. This adds a compatibility cogl/cogl-pango.h header that's will redirect to cogl-pango/cogl-pango.h with a warning, or result in an error if COGL_ENABLE_EXPERIMENTAL_2_0_API is defined.
2011-05-11 12:21:07 -04:00
cogl_pangoheadersdir = $(includedir)/cogl/cogl-pango
consistently refer to cogl-pango as "cogl-pango" This renames the pango directory to cogl-pango and it renames the installed library to libcogl-pango instead of libcoglpango.
2011-05-05 17:04:07 -04:00
cogl_pangoheaders_HEADERS = $(source_h)
Adds the ability to build Cogl standalone This adds an autogen.sh, configure.ac and build/autotool files etc under clutter/cogl and makes some corresponding Makefile.am changes that make it possible to build and install Cogl as a standalone library. Some notable things about this are: A standalone installation of Cogl installs 3 pkg-config files; cogl-1.0.pc, cogl-gl-1.0.pc and cogl-2.0.pc. The second is only for compatibility with what clutter installed though I'm not sure that anything uses it so maybe we could remove it. cogl-1.0.pc is what Clutter would use if it were updated to build against a standalone cogl library. cogl-2.0.pc is what you would use if you were writing a standalone Cogl application. A standalone installation results in two libraries currently, libcogl.so and libcogl-pango.so. Notably we don't include a major number in the sonames because libcogl supports two major API versions; 1.x as used by Clutter and the experimental 2.x API for standalone applications. Parallel installation of later versions e.g. 3.x and beyond will be supportable either with new sonames or if we can maintain ABI then we'll continue to share libcogl.so. The headers are similarly not installed into a directory with a major version number since the same headers are shared to export the 1.x and 2.x APIs (The only difference is that cogl-2.0.pc ensures that -DCOGL_ENABLE_EXPERIMENTAL_2_0_API is used). Parallel installation of later versions is not precluded though since we can either continue sharing or later add a major version suffix.
2011-02-09 21:32:11 -05:00
Give cogl-pango it's own pkg-config file We now install cogl-pango-1.0 and cogl-pango-2.0 pkg-config files that applications should optionally depend on if they want to use the cogl_pango API.
2011-05-05 16:52:40 -04:00
pc_files = cogl-pango-1.0.pc \
Make it clearer that the 2.0 API is experimental This explicitly renames the cogl-2.0 reference manual to cogl-2.0-experimental and renames the cogl-2.0 pkg-config file to cogl-2.0-experimental.pc. Hopefully this should avoid miss-understandings.
2011-06-10 13:47:12 -04:00
cogl-pango-$(COGL_API_VERSION)-experimental.pc
Give cogl-pango it's own pkg-config file We now install cogl-pango-1.0 and cogl-pango-2.0 pkg-config files that applications should optionally depend on if they want to use the cogl_pango API.
2011-05-05 16:52:40 -04:00
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files)
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
EXTRA_DIST += cogl-pango.pc.in
DISTCLEANFILES += $(pc_files)
win32: drop support
2016-01-12 16:44:14 -05:00
EXTRA_DIST += cogl-pango.symbols
VS 2008/2010 project files to build Cogl These are the VS 2008/2010 project files to build Cogl, with a README.txt to explain the process involved. Note that the Cogl and Cogl-Pango projects (and filters for VS2010) are expanded with the correct source file listings during "make dist", which is done to simplify maintenance of these project files. -added preconfigured config.h(.win32.in), which is expanded with the correct versioining info during autogen -added preconfigued cogl/cogl-defines.h.win32 -added symbols files for cogl and cogl-pango -Have configure.ac expand the config.h.win32.in into config.h.win32 with the correct versioning info, etc, and to include the Visual C++ project files for distribution -Added rules in cogl/Makefile.am to expand the cogl VS 2008/2010 projects and filters from the templates with up-to-date source file listings, to distribute cogl-enum-types.c, cogl-enum-types.h to ease compilation and to avoid depending on PERL on Windows installations. -Added rules in cogl-pango/Makefile.am to expand the cogl-pango VS2008/ 2010 projects and filters from the templates with up-to-date source file listings. -Added/edited various Makefile.am's in build to distribute the VS2008/2010 project files and associated items required for the build. -Update .gitignore. There needs to be a pre-configured config.h(.win32) and its template, config.h.win32.in for Visual C++ builds https://bugzilla.gnome.org/show_bug.cgi?id=650020 Reviewed-by: Neil Roberts <neil@linux.intel.com>
2011-05-12 05:06:32 -04:00
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
if HAVE_INTROSPECTION
pango: ensure g-ir-compiler can find Cogl-1.0.gir This uses INTROSPECTION_COMPILER_ARGS to pass --includedir=$(top_builddir)/cogl so when building the CoglPango typelib the compiler can find the required Cogl-1.0.gir file.
2011-05-16 12:28:55 -04:00
INTROSPECTION_COMPILER_ARGS=--includedir=$(top_builddir)/cogl
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
CoglPango-1.0.gir: libcogl-pango.la Makefile
CoglPango_1_0_gir_NAMESPACE = CoglPango
CoglPango_1_0_gir_VERSION = 1.0
Ensure that the CoglPango GIR is built against the correct libcogl If we don't specify the dependency we may end up linking against a stale libcogl.la, or, worse, a globally installed one. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-15 09:48:54 -05:00
CoglPango_1_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
CoglPango_1_0_gir_FILES = $(source_h) $(source_c)
build: update to build with automake 1.13 This make autogen.sh look for automake-1.13 and also updates all Makefile.am files to no longer use the INCLUDES variable which automake 1.13 warns is deprecated by AM_CPPFLAGS. https://bugzilla.gnome.org/show_bug.cgi?id=690891 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5de5569e960102afe979a5f2f0403e1defebca62)
2013-01-17 17:56:41 -05:00
CoglPango_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
CoglPango_1_0_gir_INCLUDES = Pango-1.0 PangoCairo-1.0
CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0
CoglPango_1_0_gir_SCANNERFLAGS = \
--warn-all \
--identifier-prefix=CoglPango \
--symbol-prefix=cogl_pango \
deprecate #include <cogl/cogl-pango.h> cogl-pango is conceptually a separate library so it doesn't seem appropriate to bundle the headers with all the other cogl headers. Also in-tree the headers live in a cogl-pango directory so if we want examples that can include cogl-pango consistently when built in or out of tree using the convention #include <cogl-pango/cogl-pango.h> makes that easy. This adds a compatibility cogl/cogl-pango.h header that's will redirect to cogl-pango/cogl-pango.h with a warning, or result in an error if COGL_ENABLE_EXPERIMENTAL_2_0_API is defined.
2011-05-11 12:21:07 -04:00
--c-include='cogl-pango/cogl-pango.h' \
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
--include-uninstalled=$(top_builddir)/cogl/Cogl-1.0.gir
Registers gtypes for all public objects and structs This adds much more comprehensive support for gobject-introspection based bindings by registering all objects as fundamental types that inherit from CoglObject, and all structs as boxed types. Co-Author: Robert Bragg <robert@linux.intel.com> Reviewed-by: Neil Roberts <neil@linux.intel.com>
2013-09-02 11:02:42 -04:00
CoglPango-2.0.gir: libcogl-pango.la Makefile
CoglPango_2_0_gir_NAMESPACE = CoglPango
CoglPango_2_0_gir_VERSION = 2.0
CoglPango_2_0_gir_LIBS = $(top_builddir)/cogl/libcogl.la libcogl-pango.la
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_INCLUDES = Pango-1.0 PangoCairo-1.0
CoglPango_2_0_gir_EXPORT_PACKAGES = cogl-pango-2.0-experimental
CoglPango_2_0_gir_SCANNERFLAGS = \
--warn-all \
--identifier-prefix=CoglPango \
--symbol-prefix=cogl_pango \
--c-include='cogl-pango/cogl-pango.h' \
--include-uninstalled=$(top_builddir)/cogl/Cogl-2.0.gir
INTROSPECTION_GIRS += CoglPango-1.0.gir CoglPango-2.0.gir
build: Generate CoglPango introspection data
2011-05-06 12:13:56 -04:00
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
Reference in New Issue Copy Permalink