brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clutter GIR depends on ClutterJson GIR conditionally

Browse Source 
If we're building Clutter with a system JSON-GLib we need to skip
the typelib compilation of ClutterJson since we depend on Json-1.0.gir
directly.
This commit is contained in:
Emmanuele Bassi 2009-08-12 15:32:18 +01:00
parent 6fcf5c1820
commit cc6aa6e4d5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/Makefile.am
View File

@ -10,6 +10,7 @@ SUBDIRS += json
clutter_json_include = -I$(top_srcdir)/clutter/json clutter_json_include = -I$(top_srcdir)/clutter/json
clutter_json_dep = json/libclutter-json.la clutter_json_dep = json/libclutter-json.la
clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la
clutter_json_gir = ClutterJson-@CLUTTER_API_VERSION@.gir
endif endif
DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32 fruity DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32 fruity
@ -278,7 +279,7 @@ BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir
# ClutterJson.gir and Cogl.gir are used included into Clutter.gir, so need # ClutterJson.gir and Cogl.gir are used included into Clutter.gir, so need
# to be built before the typelib is generated # to be built before the typelib is generated
Clutter-@CLUTTER_API_VERSION@.typelib: ClutterJson-@CLUTTER_API_VERSION@.gir Cogl-@CLUTTER_API_VERSION@.gir Clutter-@CLUTTER_API_VERSION@.typelib: $(clutter_json_gir) Cogl-@CLUTTER_API_VERSION@.gir
# We build Cogl.gir in the cogl/ subdir, but it needs to reference the shared # We build Cogl.gir in the cogl/ subdir, but it needs to reference the shared
# library that it's built into, so we delay compiling the gir into typelib # library that it's built into, so we delay compiling the gir into typelib