From 7fa011b037e77fea4eb998c8d3950487bcf1cb5e Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Fri, 4 Jun 2010 17:17:45 +0100 Subject: [PATCH] build: Don't distribute clutter-version.h and cogl-defines.h As with a351ff2af earlier, distributing headers generated at configure time conflicts with out of tree builds as the distributed headers will be included first instead of including the generated ones. --- cogl/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogl/Makefile.am b/cogl/Makefile.am index f1247b0f2..59cff8fac 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -190,12 +190,12 @@ EXTRA_DIST += stb_image.c cogl_headers = \ $(cogl_public_h) \ $(srcdir)/cogl-deprecated.h \ - cogl-defines.h \ cogl-enum-types.h \ $(NULL) coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl coglinclude_HEADERS = $(cogl_headers) +nodist_coglinclude_HEADERS = cogl-defines.h if HAVE_INTROSPECTION Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la