# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1246948305 0
# Node ID 659345e5473be1a424d01a68232e12fe0b6566d9
# Parent  4f0fcb2526e6ee5e7288383e9d289ad77fe276cf# Parent  12edccab4944ce5439346f13c1adb20da63952d7
merge of '0866182af6b0894f55f42ac5dd8d01f9a2c3160c'
     and '921a6693312cc38dd6dbc93e91d6bf5c60938634'

diff -r 4f0fcb2526e6 -r 659345e5473b libpurple/Makefile.am
--- a/libpurple/Makefile.am	Tue Jul 07 06:30:54 2009 +0000
+++ b/libpurple/Makefile.am	Tue Jul 07 06:31:45 2009 +0000
@@ -53,7 +53,6 @@
 	idle.c \
 	imgstore.c \
 	log.c \
-	marshallers.c \
 	media.c \
 	mediamanager.c \
 	mime.c \
@@ -192,9 +191,9 @@
 		$(purple_builtheaders)
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
 # We should probably make this better
-dbus_signals = $(purple_coresources) \
-	protocols/irc/irc.c \
-	protocols/jabber/libxmpp.c
+dbus_signals = $(addprefix $(srcdir)/, $(purple_coresources)) \
+	$(srcdir)/protocols/irc/irc.c \
+	$(srcdir)/protocols/jabber/libxmpp.c
 
 dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders)
 	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@