pygobject r854 - in trunk: . gobject tests

[johan svn gnome org]

Author: johan
Date: Fri Jul 25 11:21:50 2008
New Revision: 854
URL: http://svn.gnome.org/viewvc/pygobject?rev=854&view=rev

Log:
2008-07-25  Johan Dahlin  <johan gnome org>

    * gobject/Makefile.am:
    * tests/Makefile.am:
    Make distcheck pass



Modified:
   trunk/ChangeLog
   trunk/gobject/Makefile.am
   trunk/tests/Makefile.am

Modified: trunk/gobject/Makefile.am
==============================================================================
--- trunk/gobject/Makefile.am	(original)
+++ trunk/gobject/Makefile.am	Fri Jul 25 11:21:50 2008
@@ -42,7 +42,7 @@
 _gobject_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(FFI_LIBS) \
-	$(top_srcdir)/glib/libpyglib-2.0.la
+	$(top_builddir)/glib/libpyglib-2.0.la
 _gobject_la_SOURCES = \
 	gobjectmodule.c \
 	pygboxed.c \

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Fri Jul 25 11:21:50 2008
@@ -39,15 +39,18 @@
 testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
 	$(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
 
-check-local: $(top_srcdir)/gobject/__init__.py $(top_srcdir)/gio/__init__.py
+check-local: $(top_srcdir)/glib/__init__.py $(top_srcdir)/gobject/__init__.py $(top_srcdir)/gio/__init__.py
 	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
+	   cp $(top_srcdir)/glib/*.py $(top_builddir)/glib; \
 	   cp $(top_srcdir)/gobject/*.py $(top_builddir)/gobject; \
 	   cp $(top_srcdir)/gio/*.py $(top_builddir)/gio; \
 	fi
 	@$(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(top_srcdir)
 	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
+	   rm -f $(top_builddir)/glib/*.py; \
 	   rm -f $(top_builddir)/gobject/*.py; \
 	   rm -f $(top_builddir)/gio/*.py; \
 	fi
+	@rm -fr $(top_builddir)/glib/*.pyc
 	@rm -fr $(top_builddir)/gobject/*.pyc
 	@rm -fr $(top_builddir)/gio/*.pyc