From 752a97f9609bfe15b522a30dc0ca6d2c5b5acfc8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 25 Mar 2011 18:07:06 -0400 Subject: Don't dist gir/cairo-1.0.gir, it's generated We should not be disting it, because it contains values derived from configure. Extract it out of STATIC_GIRSOURCES, and also move it to a Makefile rule rather than AC_SUBST as it should be so it gets cleaned properly. --- Makefile-gir.am | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Makefile-gir.am') diff --git a/Makefile-gir.am b/Makefile-gir.am index 5751f801..02a4ea17 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -1,7 +1,6 @@ BUILT_GIRSOURCES = STATIC_GIRSOURCES = \ - gir/cairo-1.0.gir \ gir/DBus-1.0.gir \ gir/DBusGLib-1.0.gir \ gir/fontconfig-2.0.gir \ @@ -14,6 +13,17 @@ STATIC_GIRSOURCES = \ gir/xrandr-1.3.gir EXTRA_DIST += $(STATIC_GIRSOURCES) +cairogirdir=$(GIR_DIR) +cairogir_DATA = gir/cairo-1.0.gir +gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile + sed \ + -e s,%CAIRO_SHARED_LIBRARY%,$(CAIRO_SHARED_LIBRARY), \ + -e s,%CAIRO_GIR_PACKAGE%,$(CAIRO_GIR_PACKAGE), \ + < $< > $@.tmp && mv $@.tmp $@ +BUILT_SOURCES += gir/cairo-1.0.gir +CLEANFILES += gir/cairo-1.0.gir +EXTRA_DIST += cairo-1.0.gir.in + # Doesn't seem to work to do gir/%.typelib =( gir/cairo-1.0.typelib: g-ir-compiler gir/DBus-1.0.typelib: g-ir-compiler -- cgit v1.2.1