isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Don't distribute clutter-version.h and cogl-defines.h

Browse Source 
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.
This commit is contained in:
Damien Lespiau 2010-06-04 17:17:45 +01:00
parent f6078eca83
commit cef4c8de76
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/Makefile.am
View File

@ -136,7 +136,6 @@ source_h = \
$(srcdir)/clutter-types.h \ $(srcdir)/clutter-types.h \
$(srcdir)/clutter-units.h \ $(srcdir)/clutter-units.h \
$(srcdir)/clutter-util.h \ $(srcdir)/clutter-util.h \
$(top_builddir)/clutter/clutter-version.h \
$(NULL) $(NULL)
# glib-genmarshal rules # glib-genmarshal rules
@ -288,7 +287,8 @@ clutter_HEADERS = \
$(top_builddir)/clutter/clutter-enum-types.h \ $(top_builddir)/clutter/clutter-enum-types.h \
$(top_srcdir)/clutter/clutter.h $(top_srcdir)/clutter/clutter.h
nodist_clutter_HEADERS = \ nodist_clutter_HEADERS = \
$(top_builddir)/clutter/clutter-json.h $(top_builddir)/clutter/clutter-json.h \
$(top_builddir)/clutter/clutter-version.h
DISTCLEANFILES += clutter-version.h DISTCLEANFILES += clutter-version.h
@ -343,6 +343,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
--pkg pangocairo \ --pkg pangocairo \
--output $@ \ --output $@ \
$(clutter_HEADERS) \ $(clutter_HEADERS) \
$(nodist_clutter_HEADERS) \
$(source_c) $(source_c)
BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir

2
clutter/cogl/cogl/Makefile.am
View File

@ -190,12 +190,12 @@ EXTRA_DIST += stb_image.c
cogl_headers = \ cogl_headers = \
$(cogl_public_h) \ $(cogl_public_h) \
$(srcdir)/cogl-deprecated.h \ $(srcdir)/cogl-deprecated.h \
cogl-defines.h \
cogl-enum-types.h \ cogl-enum-types.h \
$(NULL) $(NULL)
coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
coglinclude_HEADERS = $(cogl_headers) coglinclude_HEADERS = $(cogl_headers)
nodist_coglinclude_HEADERS = cogl-defines.h
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la