Various small fixes for build system. Fixes bug 624389

 * Add rules for Gee-1.0.gir and gee-internals-1.0.vapi
 * Clean all vala-generated files in maintainer mode
 * Clean typelib

diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am
index a226285..6043188 100644 (file)
--- a/benchmark/Makefile.am
+++ b/benchmark/Makefile.am
@@ -29,3 +29,9 @@ benchmarks.vala.stamp: $(benchmarks_VALASOURCES)
        touch $@
 benchmarks_LDADD = $(progs_ldadd)
 EXTRA_DIST += $(benchmarks_VALASOURCES)
+
+MAINTAINERCLEANFILES = \
+       $(benchmarks_VALASOURCES:.vala=.c) \
+       benchmarks.vala.stamp \
+       $(NULL)
+

diff --git a/gee/Makefile.am b/gee/Makefile.am
index 5757425..2a6bde7 100644 (file)
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -75,7 +75,7 @@ AM_VALAFLAGS = \
        $(VALAFLAGS) \
        $(NULL)
 
-gee-1.0.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
+Gee-1.0.gir gee-internals-1.0.vapi gee-1.0.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
        $(VALAC) -C $(AM_VALAFLAGS) $^
        touch $@
 
@@ -109,3 +109,18 @@ Gee-1.0.typelib: Gee-1.0.gir
 endif
 
 EXTRA_DIST += $(libgee_la_VALASOURCES) gee-1.0.vapi Gee-1.0.gir gee.vala.stamp
+
+MAINTAINERCLEANFILES = \
+       $(libgee_la_VALASOURCES:.vala=.c) \
+       gee.vala.stamp \
+       gee-internals-1.0.vapi \
+       gee-1.0.vapi \
+       Gee-1.0.gir \
+       gee.h \
+       gee-internals.h \
+       $(NULL)
+
+CLEANFILES = \
+       Gee-1.0.typelib \
+       $(NULL)
+

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7976bb4..b4bfffd 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -76,6 +76,11 @@ coverage-report:
        @echo 'file://@abs_top_builddir@/tests/coverage/index.html'
        @echo
 
+MAINTAINERCLEANFILES = \
+       $(tests_VALASOURCES:.vala=.c) \
+       tests.vala.stamp \
+       $(NULL)
+
 clean-local:
        -rm -rf coverage