isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: only have libcogl-pango depend on pango

Browse Source 
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>
This commit is contained in:
Robert Bragg 2011-08-02 14:14:06 +01:00
parent df30641f0b
commit 5012bcf1d1
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl-pango/Makefile.am
View File

@ -27,9 +27,9 @@ source_h_priv = \
lib_LTLIBRARIES = libcogl-pango.la lib_LTLIBRARIES = libcogl-pango.la
libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv) libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS) libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_PANGO_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
libcogl_pango_la_LIBADD = $(top_builddir)/cogl/libcogl.la libcogl_pango_la_LIBADD = $(top_builddir)/cogl/libcogl.la
libcogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) libcogl_pango_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
libcogl_pango_la_LDFLAGS = \ libcogl_pango_la_LDFLAGS = \
-export-dynamic \ -export-dynamic \
-export-symbols-regex "^cogl_pango_.*" -export-symbols-regex "^cogl_pango_.*"
@ -70,7 +70,7 @@ 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 = libcogl-pango.la CoglPango_1_0_gir_LIBS = libcogl-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 = $(INCLUDES) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS) CoglPango_1_0_gir_CFLAGS = $(INCLUDES) $(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
CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0 CoglPango_1_0_gir_EXPORT_PACKAGES = cogl-pango-1.0
CoglPango_1_0_gir_SCANNERFLAGS = \ CoglPango_1_0_gir_SCANNERFLAGS = \

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

@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
apiversion=@COGL_API_VERSION@ apiversion=@COGL_API_VERSION@
requires=@COGL_PKG_REQUIRES@ requires=@COGL_PKG_REQUIRES@ @COGL_PANGO_PKG_REQUIRES@
Name: Cogl Name: Cogl
Description: An pango integration library for Cogl Description: An pango integration library for Cogl

6
configure.ac
View File

@ -345,7 +345,7 @@ AM_CONDITIONAL([BUILD_COGL_PANGO], [test "x$enable_cogl_pango" = "xyes"])
AS_IF([test "x$enable_cogl_pango" = "xyes"], AS_IF([test "x$enable_cogl_pango" = "xyes"],
[ [
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES pangocairo >= pangocairo_req_version" COGL_PANGO_PKG_REQUIRES="$COGL_PANGO_PKG_REQUIRES pangocairo >= pangocairo_req_version"
] ]
) )
@ -885,6 +885,8 @@ if test -n "$COGL_PKG_REQUIRES_GL"; then
COGL_DEP_CFLAGS="$COGL_DEP_CFLAGS $COGL_DEP_CFLAGS_GL" COGL_DEP_CFLAGS="$COGL_DEP_CFLAGS $COGL_DEP_CFLAGS_GL"
COGL_DEP_LIBS="$COGL_DEP_LIBS $gl_libs" COGL_DEP_LIBS="$COGL_DEP_LIBS $gl_libs"
fi fi
AC_SUBST(COGL_PANGO_PKG_REQUIRES)
PKG_CHECK_MODULES(COGL_PANGO_DEP, [$COGL_PANGO_PKG_REQUIRES])
dnl ================================================================ dnl ================================================================
dnl Misc program dependencies. dnl Misc program dependencies.
@ -940,6 +942,8 @@ AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1],
AC_SUBST(COGL_DEP_CFLAGS) AC_SUBST(COGL_DEP_CFLAGS)
AC_SUBST(COGL_DEP_LIBS) AC_SUBST(COGL_DEP_LIBS)
AC_SUBST(COGL_PANGO_DEP_CFLAGS)
AC_SUBST(COGL_PANGO_DEP_LIBS)
AC_SUBST(COGL_EXTRA_CFLAGS) AC_SUBST(COGL_EXTRA_CFLAGS)
AC_SUBST(COGL_EXTRA_LDFLAGS) AC_SUBST(COGL_EXTRA_LDFLAGS)

1
examples/Makefile.am
View File

@ -29,6 +29,7 @@ if BUILD_COGL_PANGO
noinst_PROGRAMS += crate noinst_PROGRAMS += crate
crate_SOURCES = crate.c crate_SOURCES = crate.c
crate_LDADD = $(common_ldadd) $(top_builddir)/cogl-pango/libcogl-pango.la crate_LDADD = $(common_ldadd) $(top_builddir)/cogl-pango/libcogl-pango.la
crate_CFLAGS = $(AM_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
endif endif
if X11_TESTS if X11_TESTS