merge of '1c02a350fc070584ad7a56057024912ff34fa039'

Wed, 08 Jul 2009 04:07:23 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Wed, 08 Jul 2009 04:07:23 +0000
changeset 27678
3bcf90eaeef5
parent 27675
1c02a350fc07 (current diff)
parent 27677
a333ae3d9af9 (diff)
child 27679
b01a7d3d6700

merge of '1c02a350fc070584ad7a56057024912ff34fa039'
and 'a333ae3d9af9278690eae12d44917cd5fb484c19'


committer: Paul Aurich <darkrain42@pidgin.im>

--- a/libpurple/Makefile.am	Wed Jul 08 00:50:29 2009 +0000
+++ b/libpurple/Makefile.am	Wed Jul 08 04:07:23 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= \

mercurial