Mercurial > pidgin3 / changeset

changeset

merge of '2187f9250a16ad1a137fd9d85f182385071b993c'

Thu, 03 May 2007 14:34:36 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Thu, 03 May 2007 14:34:36 +0000
changeset 16867
66a8612c9d86
parent 16866
2187f9250a16 (current diff)
parent 16812
ca2e1101631d (diff)
child 16868
512575ba14cb

merge of '2187f9250a16ad1a137fd9d85f182385071b993c'
and 'ca2e1101631d27b5071d9a9d912f0eea52f5e19e'


committer: Luke Schierer <lschiere@pidgin.im>

libpurple/Makefile.am file | annotate | diff | comparison | revisions
libpurple/plugins/Makefile.am file | annotate | diff | comparison | revisions
libpurple/plugins/perl/Makefile.am file | annotate | diff | comparison | revisions 
--- a/finch/libgnt/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/finch/libgnt/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -64,12 +64,12 @@
 	gntmarshal.h \
 	gntmarshal.c
 
-gntmarshal.c: genmarshal gntmarshal.h
+gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
 	echo "#include \"gntmarshal.h\"" > $@
-	cat genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --body >> $@
+	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --body >> $@
 
-gntmarshal.h: genmarshal
-	cat genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --header > $@
+gntmarshal.h: $(srcdir)/genmarshal
+	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --header > $@
 
 libgnt_laincludedir=$(includedir)/gnt
 libgnt_lainclude_HEADERS = \
--- a/libpurple/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -131,6 +131,8 @@
 	xmlnode.h \
 	whiteboard.h
 
+BUILT_SOURCES = version.h
+
 if ENABLE_DBUS
 
 CLEANFILES = \
--- a/libpurple/plugins/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/plugins/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -130,6 +130,7 @@
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
--- a/libpurple/plugins/perl/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -155,6 +155,7 @@
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
--- a/libpurple/plugins/ssl/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/plugins/ssl/Makefile.am	Thu May 03 14:34:36 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)
--- a/libpurple/plugins/tcl/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/plugins/tcl/Makefile.am	Thu May 03 14:34:36 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) \
--- a/libpurple/protocols/bonjour/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -37,6 +37,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(HOWL_CFLAGS)
--- a/libpurple/protocols/gg/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/gg/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -72,6 +72,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(INTGG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/irc/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -30,5 +30,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/jabber/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -68,6 +68,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBXML_CFLAGS)
--- a/libpurple/protocols/msn/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -85,5 +85,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/novell/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/novell/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -52,5 +52,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS)
--- a/libpurple/protocols/oscar/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -79,5 +79,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/qq/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Thu May 03 14:34:36 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) \
--- a/libpurple/protocols/sametime/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/sametime/Makefile.am	Thu May 03 14:34:36 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 = \
--- a/libpurple/protocols/silc/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -31,5 +31,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/simple/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/simple/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -31,5 +31,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/toc/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/toc/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -27,5 +27,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/yahoo/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -49,5 +49,6 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- a/libpurple/protocols/zephyr/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/libpurple/protocols/zephyr/Makefile.am	Thu May 03 14:34:36 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) \
--- a/pidgin/plugins/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Thu May 03 14:34:36 2007 +0000
@@ -108,7 +108,7 @@
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_builddir)/src \
+	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
--- a/pidgin/plugins/cap/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/pidgin/plugins/cap/Makefile.am	Thu May 03 14:34:36 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) \
--- a/pidgin/plugins/crazychat/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/pidgin/plugins/crazychat/Makefile.am	Thu May 03 14:34:36 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) \
--- a/pidgin/plugins/gestures/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/pidgin/plugins/gestures/Makefile.am	Thu May 03 14:34:36 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)
--- a/pidgin/plugins/gevolution/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/pidgin/plugins/gevolution/Makefile.am	Thu May 03 14:34:36 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) \
--- a/pidgin/plugins/perl/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/pidgin/plugins/perl/Makefile.am	Thu May 03 14:34:36 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) \
--- a/pidgin/plugins/ticker/Makefile.am	Thu May 03 13:39:07 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.am	Thu May 03 14:34:36 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)

Mercurial Repository: pidgin3

mercurial