diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gobject/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
3 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2008-07-25 Johan Dahlin <johan@gnome.org> + * gobject/Makefile.am: + * tests/Makefile.am: + Make distcheck pass + +2008-07-25 Johan Dahlin <johan@gnome.org> + * gobject/gobjectmodule.c (init_gobject): * gobject/pygobject-private.h: Remove private structures which moved to pyglib. diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 74c2e4c2..4a58f3a8 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -42,7 +42,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject _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 \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 21fa0575..f7a98803 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -39,15 +39,18 @@ tests = \ 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 |