diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2014-12-16 00:15:18 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-04-23 20:31:49 +0100 |
| commit | f0f7216853e80c5701833c9f8c5a7feef192300a (patch) | |
| tree | ca86830fb586bcb2f7057b0737e42212bb39ad91 | |
| parent | 0adac3f9dd746e9f33a36b250568d5d18da2a0a0 (diff) | |
| download | clutter-f0f7216853e80c5701833c9f8c5a7feef192300a.tar.gz | |
build: More out of tree build fixes
(cherry picked from commit 2f490c9dcc3111217ddb968054c1c0d5e475564b)
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
| -rw-r--r-- | clutter/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/reference/clutter/Makefile.am | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 4d0e18952..260cb9528 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -796,7 +796,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.marshal # glib-mkenums rules glib_enum_h = clutter-enum-types.h glib_enum_c = clutter-enum-types.c -glib_enum_headers = $(source_h) $(backend_source_h) +glib_enum_headers = $(source_h) $(deprecated_h) $(backend_source_h) include $(top_srcdir)/build/autotools/Makefile.am.enums pkgconfigdir = $(libdir)/pkgconfig diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am index c44be44fb..7ee0ecf12 100644 --- a/doc/reference/clutter/Makefile.am +++ b/doc/reference/clutter/Makefile.am @@ -37,11 +37,12 @@ FIXXREF_OPTIONS = \ HFILE_GLOB = \ $(top_srcdir)/clutter/*.h \ $(top_builddir)/clutter/*.h \ + $(top_srcdir)/clutter/deprecated/*.h \ $(top_srcdir)/clutter/x11/clutter-x11.h \ $(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \ $(top_srcdir)/clutter/x11/clutter-glx-texture-pixmap.h \ $(top_srcdir)/clutter/egl/clutter-egl.h \ - $(top_srcdir)/clutter/cex100/clutter-cex100.h \ + $(top_builddir)/clutter/cex100/clutter-cex100.h \ $(top_srcdir)/clutter/win32/clutter-win32.h \ $(top_srcdir)/clutter/gdk/clutter-gdk.h \ $(top_srcdir)/clutter/wayland/clutter-wayland.h \ @@ -56,7 +57,8 @@ CFILE_GLOB = \ $(top_srcdir)/clutter/gdk/*.c \ $(top_srcdir)/clutter/cex100/*.c \ $(top_srcdir)/clutter/egl/*.c \ - $(top_srcdir)/clutter/wayland/*.c + $(top_srcdir)/clutter/wayland/*.c \ + $(top_srcdir)/clutter/deprecated/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h |