Revision: 2250
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2250&view=rev
Author: tmzullinger
Date: 2009-01-31 22:33:55 +0000 (Sat, 31 Jan 2009)
Log Message:
-----------
Only use PYGOBJECT_{CFLAGS,LIBS} in bindings/python
Thanks to Frank Lichtenheld (fixes Debian bug #452829).
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/bindings/python/Makefile.am
libgpod/trunk/configure.ac
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2009-01-31 21:11:52 UTC (rev 2249)
+++ libgpod/trunk/ChangeLog 2009-01-31 22:33:55 UTC (rev 2250)
@@ -1,3 +1,9 @@
+2009-01-31 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * bindings/python/Makefile.am, configure.ac:
+ Only use PYGOBJECT_{CFLAGS,LIBS} in bindings/python. Thanks
+ to Frank Lichtenheld (fixes Debian bug #452829).
+
2009-01-21 Christophe Fergeau <teuf at gnome.org>
* src/itdb_device.c: fix itdb_device_new prototype
Modified: libgpod/trunk/bindings/python/Makefile.am
===================================================================
--- libgpod/trunk/bindings/python/Makefile.am 2009-01-31 21:11:52 UTC (rev
2249)
+++ libgpod/trunk/bindings/python/Makefile.am 2009-01-31 22:33:55 UTC (rev
2250)
@@ -40,9 +40,9 @@
nodist_gpod_PYTHON = gpod.py
gpod_LTLIBRARIES = _gpod.la
nodist__gpod_la_SOURCES = gpod_wrap.c
-_gpod_la_CPPFLAGS = $(PYTHON_INCLUDES) $(LIBGPOD_CFLAGS) $(INCLUDES)
+_gpod_la_CPPFLAGS = $(PYTHON_INCLUDES) $(LIBGPOD_CFLAGS) $(PYGOBJECT_CFLAGS)
$(INCLUDES)
_gpod_la_LDFLAGS = -module -avoid-version
-_gpod_la_LIBADD = $(LIBGPOD_LIBS) $(top_builddir)/src/libgpod.la
+_gpod_la_LIBADD = $(LIBGPOD_LIBS) $(PYGOBJECT_LIBS)
$(top_builddir)/src/libgpod.la
gpod_doc.i: $(srcdir)/gpod_doc.i.in $(srcdir)/gtkdoc-to-swig.xsl
cat $< > $@
Modified: libgpod/trunk/configure.ac
===================================================================
--- libgpod/trunk/configure.ac 2009-01-31 21:11:52 UTC (rev 2249)
+++ libgpod/trunk/configure.ac 2009-01-31 22:33:55 UTC (rev 2250)
@@ -212,12 +212,12 @@
fi
if test x"$have_pygobject" = xyes; then
AC_DEFINE_UNQUOTED(HAVE_PYGOBJECT, 1)
- LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
- LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
else
have_pygobject=no
fi
AM_CONDITIONAL(HAVE_PYGOBJECT, test x"$have_pygobject" = xyes)
+AC_SUBST(PYGOBJECT_CFLAGS)
+AC_SUBST(PYGOBJECT_LIBS)
dnl **************************************************
dnl * internationalization support
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
