← Back to branch summary

~oem-solutions-group/unity-2d/clutter-1.0

« back to all changes in this revision

Viewing changes to clutter/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-09-06 21:02:03 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090906210203-pqjxypxpcvdp4vr7
Tags: 1.0.4-0ubuntu1
https://launchpad.net/bugs/425339
* New upstream release (LP: #425339)
  - Depend on GObject-Introspection 0.6.4, to fix the generation of
    introspection data from uninstalled libraries
  - Fix a crash when closing multiple stages
  - Help gtk-doc pick up ClutterInterval as an object
  - Do not premultiply the color twice inside the CoglPango renderer
  - Fix keyboard navigation of works inside ClutterText
  - Allow key events to bubble up to its parent container if the
    event contains the control modifier is detected
  - Documentation fixes
  - Build fixes
  - Update the MingW script for building Clutter on Windows
  - Update the build instructions for OS X
  - On X11, make sure to destroy the stage Window when switching to
    a foreign one
  - Fix a bug where clutter_actor_apply_relative_transform() was no
    using the right vertex to perform the transformation
* debian/control: bump gobject-introspection and related from 0.6.3 to
  0.6.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/Makefile.in
231
231
PACKAGE_NAME = @PACKAGE_NAME@
232
232
PACKAGE_STRING = @PACKAGE_STRING@
233
233
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
234
PACKAGE_URL = @PACKAGE_URL@
234
235
PACKAGE_VERSION = @PACKAGE_VERSION@
235
236
PANGO_PREFIX = @PANGO_PREFIX@
236
237
PATH_SEPARATOR = @PATH_SEPARATOR@
342
343
        $(CLUTTER_CFLAGS)                               \
343
344
        $(NULL)
344
345
 
345
 
AM_CFLAGS = $(GCC_FLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 
346
AM_CFLAGS = $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
346
347
LDADD = \
347
348
        $(CLUTTER_LT_LDFLAGS) \
348
349
        -export-dynamic \
1421
1422
@HAVE_INTROSPECTION_TRUE@               --include=PangoCairo-1.0 \
1422
1423
@HAVE_INTROSPECTION_TRUE@               --include=Cogl-@CLUTTER_API_VERSION@ \
1423
1424
@HAVE_INTROSPECTION_TRUE@               --include=ClutterJson-@CLUTTER_API_VERSION@ \
1424
 
@HAVE_INTROSPECTION_TRUE@               --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
 
1425
@HAVE_INTROSPECTION_TRUE@               --library=libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la \
1425
1426
@HAVE_INTROSPECTION_TRUE@               --libtool="$(top_builddir)/libtool" \
1426
1427
@HAVE_INTROSPECTION_TRUE@               --pkg gobject-2.0 \
1427
1428
@HAVE_INTROSPECTION_TRUE@               --pkg pango \
1441
1442
# Clutter.gir to Cogl.gir
1442
1443
@HAVE_INTROSPECTION_TRUE@Cogl-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir cogl/Cogl-@CLUTTER_API_VERSION@.gir
1443
1444
@HAVE_INTROSPECTION_TRUE@       shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \
1444
 
@HAVE_INTROSPECTION_TRUE@       sed "s/shared-library=\"clutter-cogl\"/shared-library=\"$$shlib\"/"< cogl/Cogl-@CLUTTER_API_VERSION@.gir > $@
 
1445
@HAVE_INTROSPECTION_TRUE@       sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< cogl/Cogl-@CLUTTER_API_VERSION@.gir > $@
1445
1446
 
1446
1447
# If we are building it, ClutterJson gets the same handling as described
1447
1448
# for Cogl above
1448
1449
@HAVE_INTROSPECTION_TRUE@@LOCAL_JSON_GLIB_TRUE@ClutterJson-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir json/ClutterJson-@CLUTTER_API_VERSION@.gir
1449
1450
@HAVE_INTROSPECTION_TRUE@@LOCAL_JSON_GLIB_TRUE@ shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \
1450
 
@HAVE_INTROSPECTION_TRUE@@LOCAL_JSON_GLIB_TRUE@ sed "s/shared-library=\"clutter-json\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@CLUTTER_API_VERSION@.gir > $@
 
1451
@HAVE_INTROSPECTION_TRUE@@LOCAL_JSON_GLIB_TRUE@ sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@CLUTTER_API_VERSION@.gir > $@
1451
1452
 
1452
1453
@HAVE_INTROSPECTION_TRUE@%.typelib: %.gir $(INTROSPECTION_COMPILER)
1453
 
@HAVE_INTROSPECTION_TRUE@       $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
1454
@HAVE_INTROSPECTION_TRUE@       $(QUIET_GEN) \
 
1455
@HAVE_INTROSPECTION_TRUE@       LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
 
1456
@HAVE_INTROSPECTION_TRUE@       $(INTROSPECTION_COMPILER) \
 
1457
@HAVE_INTROSPECTION_TRUE@               --includedir=$(srcdir) \
 
1458
@HAVE_INTROSPECTION_TRUE@               --includedir=. \
 
1459
@HAVE_INTROSPECTION_TRUE@               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
1454
1460
# Tell versions [3.59,3.63) of GNU make to not export all variables.
1455
1461
# Otherwise a system limit (for SysV at least) may be exceeded.
1456
1462
.NOEXPORT: