Include g-ir-scanner.in in the distribution

and other make distcheck fixes.

diff --git a/common.mk b/common.mk
index f7d3a10..92da490 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
-SCANNER_BIN = $(top_srcdir)/tools/g-ir-scanner
+SCANNER_BIN = $(top_builddir)/tools/g-ir-scanner
 SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH
 SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
        UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4aefb0a..31ed145 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 
 bin_PROGRAMS = g-ir-compiler g-ir-generate
 bin_SCRIPTS = g-ir-scanner
-EXTRA_DIST = g-ir-scanner
+EXTRA_DIST = g-ir-scanner.in
 
 g-ir-scanner: g-ir-scanner.in Makefile
        sed -e s,@libdir\@,$(libdir), $< > $@.tmp && mv $@.tmp $@
@@ -28,3 +28,5 @@ g_ir_generate_LDADD = \
 GCOVSOURCES =                                  \
        $(g_ir_compiler_SOURCES)                \
        $(g_ir_generate_SOURCES)
+
+CLEANFILES=g-ir-scanner