# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1247025998 0
# Node ID 6b11903c87c8b5d78bbaed599a3db7e391859de9
# Parent  d9ee3adfee5879105ff0b2a85f0a84276712d36c# Parent  a50d0b8e3b7d96806b93419441e8db1ca83cf139
merge of '2010b6cf9dfaf940d22f5593c63b22db86ee8844'
     and '7142fad92bc4df6efc61c59c9115cb247b95810b'

diff -r d9ee3adfee58 -r 6b11903c87c8 libpurple/Makefile.am
--- a/libpurple/Makefile.am	Wed Jul 08 00:50:29 2009 +0000
+++ b/libpurple/Makefile.am	Wed Jul 08 04:06:38 2009 +0000
@@ -92,6 +92,9 @@
 	xmlnode.c \
 	whiteboard.c
 
+purple_builtsources = \
+	marshallers.c
+
 purple_coreheaders = \
 	account.h \
 	accountopt.h \
@@ -248,18 +251,17 @@
 bin_SCRIPTS = purple-remote purple-send purple-send-async purple-url-handler
 
 BUILT_SOURCES = $(purple_builtheaders) \
+	$(purple_builtsources) \
 	dbus-bindings.c \
 	dbus-signals.c \
 	dbus-types.c \
 	dbus-types.h \
-	marshallers.c \
-	marshallers.h \
 	purple-client-bindings.c \
 	purple-client-bindings.h
 
 else
 
-BUILT_SOURCES = $(purple_builtheaders)
+BUILT_SOURCES = $(purple_builtheaders) $(purple_builtsources)
 
 endif
 
@@ -267,6 +269,7 @@
 
 libpurple_la_SOURCES = \
 	$(purple_coresources) \
+	$(purple_builtsources) \
 	$(dbus_sources)
 
 noinst_HEADERS= \