← Back to branch summary

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

« back to all changes in this revision

Viewing changes to clutter/Makefile.am

  • 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.am
37
37
        $(CLUTTER_CFLAGS)                               \
38
38
        $(NULL)
39
39
 
40
 
AM_CFLAGS = $(GCC_FLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 
40
AM_CFLAGS = $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
41
41
 
42
42
LDADD = \
43
43
        $(CLUTTER_LT_LDFLAGS) \
262
262
                --include=PangoCairo-1.0 \
263
263
                --include=Cogl-@CLUTTER_API_VERSION@ \
264
264
                --include=ClutterJson-@CLUTTER_API_VERSION@ \
265
 
                --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
 
265
                --library=libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la \
266
266
                --libtool="$(top_builddir)/libtool" \
267
267
                --pkg gobject-2.0 \
268
268
                --pkg pango \
284
284
# Clutter.gir to Cogl.gir
285
285
Cogl-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir cogl/Cogl-@CLUTTER_API_VERSION@.gir
286
286
        shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \
287
 
        sed "s/shared-library=\"clutter-cogl\"/shared-library=\"$$shlib\"/"< cogl/Cogl-@CLUTTER_API_VERSION@.gir > $@
 
287
        sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< cogl/Cogl-@CLUTTER_API_VERSION@.gir > $@
288
288
 
289
289
BUILT_GIRSOURCES += Cogl-@CLUTTER_API_VERSION@.gir
290
290
 
293
293
# for Cogl above
294
294
ClutterJson-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir json/ClutterJson-@CLUTTER_API_VERSION@.gir
295
295
        shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \
296
 
        sed "s/shared-library=\"clutter-json\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@CLUTTER_API_VERSION@.gir > $@
 
296
        sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@CLUTTER_API_VERSION@.gir > $@
297
297
 
298
298
BUILT_GIRSOURCES += ClutterJson-@CLUTTER_API_VERSION@.gir
299
299
endif
308
308
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
309
309
 
310
310
%.typelib: %.gir $(INTROSPECTION_COMPILER)
311
 
        $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
311
        $(QUIET_GEN) \
 
312
        LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
 
313
        $(INTROSPECTION_COMPILER) \
 
314
                --includedir=$(srcdir) \
 
315
                --includedir=. \
 
316
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
312
317
 
313
318
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
314
319
endif