Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Bilien <jobi@litl.com>2009-03-24 18:36:18 (GMT)
committer Johan Bilien <jobi@litl.com>2009-03-24 18:36:18 (GMT)
commit7ba8ad03560307350786a44b8279324448bfbe66 (patch)
tree3efdafd153f45e98ae0932f987643d1a808e2efc
parente3bddab5ed270b208fbabbc06164dde675d8799e (diff)
Include g-ir-scanner.in in the distribution
and other make distcheck fixes.
-rw-r--r--common.mk2
-rw-r--r--tools/Makefile.am4
2 files changed, 4 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index f7d3a10..92da490 100644
--- 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
--- 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