* configure.ac

gnome-autogen.sh
bindings/python/Makefile.am
docs/reference/libgpod-overrides.txt
docs/reference/Makefile.am: fix make distcheck, minor automake
cleanups.

* bindings/python/gpod.i
bindings/python/gpod.i.in: rename gpod.i -> gpod.i.in.  it is now
generated by autoconf.

git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1347 f01d2545-417e-4e96-918e-98f8d0dbbcb6

7 files changed, 48 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index b56f078..6a3c776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-01-04  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* configure.ac
+	  gnome-autogen.sh
+	  bindings/python/Makefile.am
+	  docs/reference/libgpod-overrides.txt
+	  docs/reference/Makefile.am: fix make distcheck, minor automake
+	  cleanups.
+
+	* bindings/python/gpod.i
+	  bindings/python/gpod.i.in: rename gpod.i -> gpod.i.in.  it is now
+	  generated by autoconf.
+
 2006-11-26  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
 	* src/ithumb-writer.c (ithumb_writer_write_thumbnail): handle
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index abce2d1..9373edc 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,35 +1,36 @@
 SUBDIRS = examples
 
-EXTRA_DIST =		\
-	gpod.i 		\
-	ipod.py 	\
-	__init__.py	\
-	gtkpod.py
-
-CLEANFILES =		\
-	*.pyc		\
-	*.pyo		\
-	_gpod.so	\
-	gpod.py		\
-	gpod_wrap.c	\
-	gpod_wrap.o
-
-MAINTAINERCLEANFILES =	\
-	README
+EXTRA_DIST =                \
+        README.in           \
+        __init__.py         \
+        gpod.i.in           \
+        gtkpod.py           \
+        ipod.py
+
+CLEANFILES =                \
+        *.pyc               \
+        *.pyo               \
+        _gpod.so            \
+        gpod.py             \
+        gpod_wrap.*
+
+DISTCLEANFILES =            \
+        README              \
+        gpod.i
 
 if HAVE_PYTHON
-MODULE_CFLAGS	= `$(PKG_CONFIG) --cflags $(top_srcdir)/libgpod-1.0.pc` $(PYTHON_INCLUDES)
-MODULE_LIBS	= `$(PKG_CONFIG) --libs $(top_srcdir)/libgpod-1.0.pc` -L$(top_srcdir)/src/.libs
-python_DATA	= gpod.py _gpod.so
+MODULE_CFLAGS   = `$(PKG_CONFIG) --cflags $(top_builddir)/libgpod-1.0.pc` $(PYTHON_INCLUDES)
+MODULE_LIBS     = `$(PKG_CONFIG) --libs $(top_builddir)/libgpod-1.0.pc` -L$(top_srcdir)/src/.libs
+python_DATA     = gpod.py _gpod.so
 
 gpod_wrap.c: gpod.i
-	$(SWIG) -python gpod.i
+	$(SWIG) -python -o $@ gpod.i
 
 gpod.py: gpod.i
-	$(SWIG) -python gpod.i
+	$(SWIG) -python -o $@ gpod.i
 
 gpod_wrap.o: gpod_wrap.c
-	$(CC) $(MODULE_CFLAGS) -c -fpic gpod_wrap.c
+	$(CC) -I$(top_srcdir)/src $(MODULE_CFLAGS) -c -fpic gpod_wrap.c
 
 _gpod.so: gpod_wrap.o
 	$(CC) $(MODULE_LIBS) @PYTHON_LDFLAGS@ gpod_wrap.o -o $@
diff --git a/bindings/python/gpod.i b/bindings/python/gpod.i.in
index 472f9d9..90de899 100644
--- a/bindings/python/gpod.i
+++ b/bindings/python/gpod.i.in
@@ -1,4 +1,4 @@
-/* File : gpod.i */
+/* File : gpod.i.in */
 
 /*
  Copyright (C) 2005 Nick Piper <nick-gtkpod at nickpiper co uk>
@@ -30,13 +30,13 @@ Please send any fixes, improvements or suggestions to
 
 %module gpod
 %{
-#include "../../src/db-artwork-debug.h" 
-#include "../../src/db-artwork-parser.h" 
-#include "../../src/db-image-parser.h" 
-#include "../../src/db-itunes-parser.h" 
-#include "../../src/db-parse-context.h" 
-#include "../../src/itdb.h" 
-#include "../../src/itdb_private.h"
+#include "db-artwork-debug.h" 
+#include "db-artwork-parser.h" 
+#include "db-image-parser.h" 
+#include "db-itunes-parser.h" 
+#include "db-parse-context.h" 
+#include "itdb.h" 
+#include "itdb_private.h"
 
 PyObject* sw_get_tracks(Itdb_iTunesDB *itdb) {
   PyObject    *list;
@@ -280,4 +280,4 @@ PyObject* sw_get_playlist_tracks(Itdb_Playlist *pl);
 PyObject* sw_set_track_userdata(Itdb_Track *track, PyObject *data);
 PyObject* sw_get_track_userdata(Itdb_Track *track);
 
-%include "../../src/itdb.h"
+%include "@top_srcdir@/src/itdb.h"
diff --git a/configure.ac b/configure.ac
index c010c58..6f91045 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,7 @@ AC_SUBST(LIBGPOD_LIBS)
 AC_OUTPUT([
 Makefile
 bindings/Makefile
+bindings/python/gpod.i
 bindings/python/Makefile
 bindings/python/examples/Makefile
 docs/Makefile
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 138d70a..0ce396d 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -74,5 +74,4 @@ GTKDOC_LIBS=
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += 
+EXTRA_DIST += version.xml.in
diff --git a/docs/reference/libgpod-overrides.txt b/docs/reference/libgpod-overrides.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docs/reference/libgpod-overrides.txt
diff --git a/gnome-autogen.sh b/gnome-autogen.sh
index 58ab007..f6bd367 100755
--- a/gnome-autogen.sh
+++ b/gnome-autogen.sh
@@ -457,7 +457,7 @@ for configure_ac in $configure_files; do
     fi
 done
 
-conf_flags="--enable-maintainer-mode"
+conf_flags="--enable-maintainer-mode --enable-gtk-doc"
 
 if test x$NOCONFIGURE = x; then
     printbold Running $srcdir/configure $conf_flags "$@" ...