* glib/Makefile.am: Add make-dbus-glib-error-switch.sh to EXTRA_DIST

  so distcheck doesn't fail

* glib/examples/Makefile.am: Add example-service.xml and
  example-signal-emitter.xml to EXTRA_DIST so distcheck doesn't fail

* glib/examples/statemachine/Makefile.am: Add statemachine.xml and
  statemachine-server.xml to EXTRA_DIST so distcheck doesn't fail

* python/Makefile.am: Preprend $(srcdir)/ to source files so the
  compiler looks in the right places during distcheck

5 files changed, 23 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index bf1069ff..115f2cad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2005-07-15  John (J5) Palmieri  <johnp@redhat.com>
 
+	* glib/Makefile.am: Add make-dbus-glib-error-switch.sh to EXTRA_DIST
+	so distcheck doesn't fail
+
+	* glib/examples/Makefile.am: Add example-service.xml and 
+	example-signal-emitter.xml to EXTRA_DIST so distcheck doesn't fail
+
+	* glib/examples/statemachine/Makefile.am: Add statemachine.xml and
+	statemachine-server.xml to EXTRA_DIST so distcheck doesn't fail
+
+	* python/Makefile.am: Preprend $(srcdir)/ to source files so the
+	compiler looks in the right places during distcheck
+
+2005-07-15  John (J5) Palmieri  <johnp@redhat.com>
+
 	* glib/example/Makefile.am: Fix a typo which cause make distcheck
 	to fail
 
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 2ff47a87..4e3b796c 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -73,7 +73,7 @@ regenerate-built-sources:
 	echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c &&					    \
         @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
 
-EXTRA_DIST=dbus-gmarshal.list
+EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh
 
 if DBUS_BUILD_TESTS
 
diff --git a/glib/examples/Makefile.am b/glib/examples/Makefile.am
index e97f5cd8..e0f825ce 100644
--- a/glib/examples/Makefile.am
+++ b/glib/examples/Makefile.am
@@ -34,3 +34,5 @@ example-signal-emitter-glue.h: example-signal-emitter.xml
 	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
 
 CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = example-service.xml example-signal-emitter.xml 
diff --git a/glib/examples/statemachine/Makefile.am b/glib/examples/statemachine/Makefile.am
index 303808b6..8395457f 100644
--- a/glib/examples/statemachine/Makefile.am
+++ b/glib/examples/statemachine/Makefile.am
@@ -8,7 +8,7 @@ if HAVE_GTK
 noinst_PROGRAMS += statemachine-client
 endif
 
-EXTRA_DIST = statemachine.h statemachine-server.h sm-marshal.list
+EXTRA_DIST = statemachine.h statemachine-server.h sm-marshal.list statemachine-server.xml statemachine.xml
 
 statemachine_server_SOURCES= statemachine-server.c sm-marshal.c statemachine.c
 statemachine_server_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
diff --git a/python/Makefile.am b/python/Makefile.am
index 7bedfd0d..302ed0d2 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=examples
 
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/dbus $(DBUS_CLIENT_CFLAGS) $(PYTHON_INCLUDES) -DDBUS_COMPILATION=1
+INCLUDES=-I$(srcdir)/$(top_builddir) -I$(srcdir)/$(top_builddir)/dbus $(DBUS_CLIENT_CFLAGS) $(PYTHON_INCLUDES) -DDBUS_COMPILATION=1
 
 dbusdir = $(pythondir)/dbus
 dbus_PYTHON = __init__.py _dbus.py decorators.py exceptions.py service.py proxies.py _util.py types.py matchrules.py glib.py
@@ -10,12 +10,12 @@ dbusbindings_LTLIBRARIES = dbus_bindings.la dbus_glib_bindings.la
 
 dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings
 dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la
-nodist_dbus_bindings_la_SOURCES = dbus_bindings.c
+nodist_dbus_bindings_la_SOURCES = $(srcdir)/dbus_bindings.c
 
 dbus_glib_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_glib_bindings 
 dbus_glib_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la
 dbus_glib_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
-nodist_dbus_glib_bindings_la_SOURCES = dbus_glib_bindings.c
+nodist_dbus_glib_bindings_la_SOURCES = $(srcdir)/dbus_glib_bindings.c
 
 
 EXTRA_DIST = 			\
@@ -34,9 +34,9 @@ CLEANFILES =			\
 dbus_bindings.pxd: $(srcdir)/dbus_bindings.pxd.in $(srcdir)/extract.py
 	-$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(top_builddir)  > $@.tmp && mv $@.tmp $@
 
-dbus_bindings.c: $(srcdir)/dbus_bindings.pyx dbus_bindings.pxd 
+dbus_bindings.c: $(srcdir)/dbus_bindings.pyx $(srcdir)/dbus_bindings.pxd 
 	-pyrexc $(srcdir)/dbus_bindings.pyx
 
-dbus_glib_bindings.c: $(srcdir)/dbus_glib_bindings.pyx dbus_bindings.pxd 
+dbus_glib_bindings.c: $(srcdir)/dbus_glib_bindings.pyx $(srcdir)/dbus_bindings.pxd 
 	-pyrexc $(srcdir)/dbus_glib_bindings.pyx