First steps towards passing distcheck

svn path=/trunk/; revision=243

diff --git a/giscanner/Makefile.am b/giscanner/Makefile.am
index 4b08a07..931d490 100644 (file)
--- a/giscanner/Makefile.am
+++ b/giscanner/Makefile.am
@@ -29,11 +29,11 @@ pkgpyexec_PYTHON =          \
        __init__.py             \
        ast.py                  \
        cgobject.py             \
-       gidlast.py              \
        gidlparser.py           \
        gidlwriter.py           \
        girparser.py            \
        girwriter.py            \
+       glibast.py              \
        glibtransformer.py      \
        odict.py                \
        sourcescanner.py        \

diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index 10391e1..99cd8a0 100644 (file)
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -1,6 +1,4 @@
-testlib_LTLIBRARIES = libfoo.la libutility.la
-testlibdir = /tmp
-install-testlibLTLIBRARIES: # prevent it from being installed
+noinst_LTLIBRARIES = libfoo.la libutility.la
 
 libfoo_la_SOURCES = foo.c foo-object.h
 libfoo_la_CFLAGS = $(GOBJECT_CFLAGS)
@@ -15,10 +13,10 @@ libutility_la_LIBADD = $(GOBJECT_LIBS)
 CLEANFILES = utility.gir Foo.gir 
 EXTRA_DIST = utility-expected.gir Foo-expected.gir 
 
-SCANNER = $(top_builddir)/tools/g-ir-scanner
+SCANNER = $(top_srcdir)/tools/g-ir-scanner
 
 utility.gir: libutility.la utility.h $(SCANNER)
-       @PYTHONPATH=$(top_srcdir) $(SCANNER) -v \
+       @PYTHONPATH=$(top_buildir) $(SCANNER) -v \
        --include=$(top_srcdir)/gir/gobject-2.0.gir \
        --library=libutility.la \
        --namespace=utility \
@@ -27,7 +25,7 @@ utility.gir: libutility.la utility.h $(SCANNER)
        --output $@
 
 Foo.gir: libfoo.la foo-object.h $(SCANNER)
-       @PYTHONPATH=$(top_srcdir) $(SCANNER) -v \
+       @PYTHONPATH=$(top_buildir) $(SCANNER) -v \
        --include=$(top_srcdir)/gir/gobject-2.0.gir \
        --include=$(srcdir)/utility.gir \
        --library=libfoo.la \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index dd4d959..785d70d 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES = \
        -I$(top_srcdir)/girepository \
        -I$(top_srcdir)/giscanner
 
+EXTRA_DIST = g-ir-scanner
+
 noinst_LTLIBRARIES = libgirepository-parser.la
 bin_PROGRAMS = g-idl-compiler g-idl-generate g-idl-scanner
 bin_SCRIPTS = g-ir-scanner