diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2016-04-08 19:58:20 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2016-04-22 18:48:00 +0200 |
| commit | a24c66137f83f1bfa869ebf5bb75d2c323fa6af4 (patch) | |
| tree | 94a471a7a12b6eb0df3f160deedff2b3c4527642 /clutter/clutter/Makefile.am | |
| parent | 44a07fd74b8896556c719bd466eb9c6eb52ed2f4 (diff) | |
| download | mutter-a24c66137f83f1bfa869ebf5bb75d2c323fa6af4.tar.gz | |
Fix the merged buildwip/rtcm/merge
Diffstat (limited to 'clutter/clutter/Makefile.am')
| -rw-r--r-- | clutter/clutter/Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am index 76ecfba64..ff4022c77 100644 --- a/clutter/clutter/Makefile.am +++ b/clutter/clutter/Makefile.am @@ -24,6 +24,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/clutter/cally \ -I$(top_builddir) \ -I$(top_builddir)/clutter \ + -I$(top_srcdir)/../cogl \ + -I$(top_builddir)/../cogl \ $(CLUTTER_DEPRECATED_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_HIDDEN_VISIBILITY_CFLAGS) \ @@ -562,7 +564,13 @@ clutter_deprecated_HEADERS = $(deprecated_h) mutterlibdir = $(libdir)/mutter mutterlib_LTLIBRARIES = libmutter-clutter-@CLUTTER_API_VERSION@.la -libmutter_clutter_@CLUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(CLUTTER_LIBS) +libmutter_clutter_@CLUTTER_API_VERSION@_la_LIBADD = \ + $(LIBM) \ + $(CLUTTER_LIBS) \ + $(top_builddir)/../cogl/cogl/libmutter-cogl.la \ + $(top_builddir)/../cogl/cogl-pango/libmutter-cogl-pango.la \ + $(top_builddir)/../cogl/cogl-path/libmutter-cogl-path.la \ + $(NULL) libmutter_clutter_@CLUTTER_API_VERSION@_la_SOURCES = \ $(backend_source_c) \ @@ -615,6 +623,9 @@ install-exec-local: # gobject-introspection rules -include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/../cogl/cogl --add-include-path=$(top_builddir)/../cogl/cogl-pango +INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/../cogl/cogl --includedir=$(top_builddir)/../cogl/cogl-pango + Clutter-@CLUTTER_API_VERSION@.gir: libmutter-clutter-@CLUTTER_API_VERSION@.la Makefile Clutter_@CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Clutter |