From 57c3e84289fd3a705a01c74c6924ed0b100da4de Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Tue, 10 Mar 2009 14:40:33 +0000 Subject: [PATCH] Fix out of tree builds Commit a383929 added the $(srcdir) prefix to all of the source files but some files are generated by the configure script and other make rules so they actually live in $(builddir). Out-of-tree builds therefore broke. --- clutter/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 9fcff9e76..cc2bc3d2a 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -158,7 +158,7 @@ source_c = \ $(srcdir)/clutter-clone.c \ $(srcdir)/clutter-color.c \ $(srcdir)/clutter-container.c \ - $(srcdir)/clutter-enum-types.c \ + $(builddir)/clutter-enum-types.c \ $(srcdir)/clutter-event.c \ $(srcdir)/clutter-feature.c \ $(srcdir)/clutter-fixed.c \ @@ -168,7 +168,7 @@ source_c = \ $(srcdir)/clutter-interval.c \ $(srcdir)/clutter-list-model.c \ $(srcdir)/clutter-main.c \ - $(srcdir)/clutter-marshal.c \ + $(builddir)/clutter-marshal.c \ $(srcdir)/clutter-media.c \ $(srcdir)/clutter-model.c \ $(srcdir)/clutter-path.c \ @@ -230,9 +230,9 @@ EXTRA_LTLIBRARIES = libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la clutterdir = $(includedir)/clutter-$(CLUTTER_API_VERSION)/clutter clutter_HEADERS = \ $(source_h) \ - $(top_srcdir)/clutter/clutter-json.h \ - $(top_srcdir)/clutter/clutter-enum-types.h \ - $(top_srcdir)/clutter/clutter-version.h \ + $(top_builddir)/clutter/clutter-json.h \ + $(top_builddir)/clutter/clutter-enum-types.h \ + $(top_builddir)/clutter/clutter-version.h \ $(top_srcdir)/clutter/clutter.h if HAVE_INTROSPECTION