From a351ff2afc1ac44f71fabc1219e928d2214f7bf8 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Thu, 3 Jun 2010 11:59:48 +0100 Subject: [PATCH] build: Do not distribute clutter-json.h clutter-jon.h is generated at configure time, we should not distribute it. This caused a build issue when compiling from a tarballs and out of tree builds as we ended up with two clutter-json.h one in $(top_srcdir)/json and the other in $(top_builddir)/json and picked up the wrong one ($(top_srcdir)/json is included first in the include search path). --- clutter/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 7983257..6cd2565 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -285,9 +285,11 @@ EXTRA_LTLIBRARIES = libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la clutterdir = $(includedir)/clutter-$(CLUTTER_API_VERSION)/clutter clutter_HEADERS = \ $(source_h) \ - $(top_builddir)/clutter/clutter-json.h \ $(top_builddir)/clutter/clutter-enum-types.h \ $(top_srcdir)/clutter/clutter.h +nodist_clutter_HEADERS = \ + $(top_builddir)/clutter/clutter-json.h + DISTCLEANFILES += clutter-version.h EXTRA_DIST += clutter-version.h.in -- 2.7.4