summaryrefslogtreecommitdiffstats
path: root/bindings
diff options
context:
space:
mode:
authorTodd Zullinger <tmzullinger@users.sourceforge.net>2007-01-04 18:55:38 +0000
committerTodd Zullinger <tmzullinger@users.sourceforge.net>2007-01-04 18:55:38 +0000
commite524e1ba62b67e9918f7a6a5be1131e126a54e1e (patch)
tree9fe9bca2b5bba27b130de4dc36a918b0e510d84a /bindings
parent4d8d0a9ae8394e9e93afe4b8b1f3df7ae0f993aa (diff)
downloadlibgpod-e524e1ba62b67e9918f7a6a5be1131e126a54e1e.tar.gz
libgpod-e524e1ba62b67e9918f7a6a5be1131e126a54e1e.tar.xz
libgpod-e524e1ba62b67e9918f7a6a5be1131e126a54e1e.zip
* 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
Diffstat (limited to 'bindings')
-rw-r--r--bindings/python/Makefile.am45
-rw-r--r--bindings/python/gpod.i.in (renamed from bindings/python/gpod.i)18
2 files changed, 32 insertions, 31 deletions
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"