gobject-introspection r243 - in trunk: giscanner tests/parser tools

[johan svn gnome org]

Author: johan
Date: Mon Apr 28 02:41:57 2008
New Revision: 243
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=243&view=rev

Log:
First steps towards passing distcheck

Modified:
   trunk/giscanner/Makefile.am
   trunk/tests/parser/Makefile.am
   trunk/tools/Makefile.am

Modified: trunk/giscanner/Makefile.am
==============================================================================
--- trunk/giscanner/Makefile.am	(original)
+++ trunk/giscanner/Makefile.am	Mon Apr 28 02:41:57 2008
@@ -29,11 +29,11 @@
 	__init__.py		\
 	ast.py			\
 	cgobject.py		\
-	gidlast.py		\
 	gidlparser.py		\
 	gidlwriter.py		\
 	girparser.py		\
 	girwriter.py		\
+	glibast.py		\
 	glibtransformer.py 	\
 	odict.py		\
 	sourcescanner.py	\

Modified: trunk/tests/parser/Makefile.am
==============================================================================
--- trunk/tests/parser/Makefile.am	(original)
+++ trunk/tests/parser/Makefile.am	Mon Apr 28 02:41:57 2008
@@ -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 @@
 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 @@
 	--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 \

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Mon Apr 28 02:41:57 2008
@@ -5,6 +5,8 @@
 	-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