[clutter/clutter-1.22] build: More out of tree build fixes
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.22] build: More out of tree build fixes
- Date: Tue, 16 Dec 2014 00:34:28 +0000 (UTC)
commit 2f490c9dcc3111217ddb968054c1c0d5e475564b
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Dec 16 00:15:18 2014 +0000
build: More out of tree build fixes
clutter/Makefile.am | 2 +-
doc/reference/clutter/Makefile.am | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 2dce003..027f66f 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -798,7 +798,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 06121c3..e48f188 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]