# HG changeset patch # User Stu Tomlinson # Date 1178196887 0 # Node ID 4419450837377266657696be8a2b81e8e05dec86 # Parent d9377d6b9e7c44cf2ddb5e868482f8b33b67a265 Now that version.h is a generated source file, we need to add -I$(top_builddir)/libpurple to CFLAGS to allow building in a separate directory from the source directory. Fixes part of #566 diff -r d9377d6b9e7c -r 441945083737 libpurple/Makefile.am --- a/libpurple/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -131,6 +131,8 @@ xmlnode.h \ whiteboard.h +BUILT_SOURCES = version.h + if ENABLE_DBUS CLEANFILES = \ diff -r d9377d6b9e7c -r 441945083737 libpurple/plugins/Makefile.am --- a/libpurple/plugins/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/plugins/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -129,6 +129,7 @@ -DVERSION=\"$(VERSION)\" \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 libpurple/plugins/perl/Makefile.am --- a/libpurple/plugins/perl/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/plugins/perl/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -151,6 +151,7 @@ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 libpurple/plugins/ssl/Makefile.am --- a/libpurple/plugins/ssl/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/plugins/ssl/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -28,6 +28,7 @@ -DDATADIR=\"$(datadir)\" \ -DLIBDIR=\"$(libdir)/libpurple\" \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/plugins/tcl/Makefile.am --- a/libpurple/plugins/tcl/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/plugins/tcl/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -15,6 +15,7 @@ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(PLUGIN_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/bonjour/Makefile.am --- a/libpurple/protocols/bonjour/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/bonjour/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -37,6 +37,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) \ $(HOWL_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/gg/Makefile.am --- a/libpurple/protocols/gg/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/gg/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -72,6 +72,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(INTGG_CFLAGS) \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/irc/Makefile.am --- a/libpurple/protocols/irc/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/irc/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -30,5 +30,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/jabber/Makefile.am --- a/libpurple/protocols/jabber/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/jabber/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -68,6 +68,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBXML_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/msn/Makefile.am --- a/libpurple/protocols/msn/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/msn/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -85,5 +85,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/novell/Makefile.am --- a/libpurple/protocols/novell/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/novell/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -52,5 +52,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/oscar/Makefile.am --- a/libpurple/protocols/oscar/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/oscar/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -79,5 +79,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/qq/Makefile.am --- a/libpurple/protocols/qq/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/qq/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -93,6 +93,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -DVERSION=\"$(VERSION)\" \ -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ $(DEBUG_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/sametime/Makefile.am --- a/libpurple/protocols/sametime/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/sametime/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -34,7 +34,8 @@ AM_CFLAGS = \ $(GLIB_CFLAGS) $(MEANWHILE_CFLAGS) \ $(DEBUG_CFLAGS) \ - -I$(top_srcdir)/libpurple + -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple AM_CPPFLAGS = \ diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/silc/Makefile.am --- a/libpurple/protocols/silc/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/silc/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -31,5 +31,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/simple/Makefile.am --- a/libpurple/protocols/simple/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/simple/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -31,5 +31,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/toc/Makefile.am --- a/libpurple/protocols/toc/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/toc/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -27,5 +27,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/yahoo/Makefile.am --- a/libpurple/protocols/yahoo/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/yahoo/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -49,5 +49,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 libpurple/protocols/zephyr/Makefile.am --- a/libpurple/protocols/zephyr/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/libpurple/protocols/zephyr/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -102,6 +102,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -I$(top_srcdir)/libpurple/protocols \ -DCONFDIR=\"$(confdir)\" \ $(GLIB_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 pidgin/plugins/cap/Makefile.am --- a/pidgin/plugins/cap/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/pidgin/plugins/cap/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -21,6 +21,7 @@ -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 pidgin/plugins/crazychat/Makefile.am --- a/pidgin/plugins/crazychat/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/pidgin/plugins/crazychat/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -33,6 +33,7 @@ AM_CPPFLAGS = -DPURPLE_PLUGINS \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ $(GTK_CFLAGS) \ $(GTKGLEXT_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 pidgin/plugins/gestures/Makefile.am --- a/pidgin/plugins/gestures/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/pidgin/plugins/gestures/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -21,6 +21,7 @@ -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) diff -r d9377d6b9e7c -r 441945083737 pidgin/plugins/gevolution/Makefile.am --- a/pidgin/plugins/gevolution/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/pidgin/plugins/gevolution/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -23,6 +23,7 @@ -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(DEBUG_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 pidgin/plugins/perl/Makefile.am --- a/pidgin/plugins/perl/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/pidgin/plugins/perl/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -98,6 +98,7 @@ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) \ diff -r d9377d6b9e7c -r 441945083737 pidgin/plugins/ticker/Makefile.am --- a/pidgin/plugins/ticker/Makefile.am Tue May 01 19:32:22 2007 +0000 +++ b/pidgin/plugins/ticker/Makefile.am Thu May 03 12:54:47 2007 +0000 @@ -22,6 +22,7 @@ -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS)