im.pidgin.gobjectification: f6f3d8091b777753fff033e4cafb622087632fe3

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f6f3d8091b777753fff033e4cafb622087632fe3
Ancestor: afd0de98d28b3483b0ba8d34d6d2e067074edd3d
Author: sadrul at pidgin.im
Date: 2008-02-28T07:57:46
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/f6f3d8091b777753fff033e4cafb622087632fe3

Modified files:
        libpurple/Makefile.am

ChangeLog: 

Readd the marshallers which got removed during the mega merge. The marshallers will be called purple_smarshal..., instead of purple_marshal... for now, to reduce the amount of work necessary to keep things compilable.

-------------- next part --------------
============================================================
--- libpurple/Makefile.am	2990b2ca47852a1c9b0f21a3ac0d31261d92af72
+++ libpurple/Makefile.am	12c086077429279032d3808fba1baa0d29472bf1
@@ -1,6 +1,7 @@ EXTRA_DIST = \
 EXTRA_DIST = \
 		dbus-analyze-functions.py \
 		dbus-analyze-types.py \
+		marshallers.list \
 		purple-notifications-example \
 		purple-remote \
 		purple-send \
@@ -30,7 +31,7 @@ pkgconfig_DATA = purple.pc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = purple.pc
 
-SUBDIRS = $(GCONF_DIR) plugins protocols tests . example
+SUBDIRS = . $(GCONF_DIR) plugins protocols tests example
 
 purple_coresources = \
 	account.c \
@@ -149,6 +150,14 @@ purple_builtheaders = purple.h version.h
 
 purple_builtheaders = purple.h version.h
 
+marshallers.h: marshallers.list
+	@echo "Generating marshallers.h"
+	$(GLIB_GENMARSHAL) --prefix=purple_smarshal marshallers.list --header > marshallers.h
+
+marshallers.c: marshallers.list
+	@echo "Generating marshallers.c"
+	$(GLIB_GENMARSHAL) --prefix=purple_smarshal marshallers.list --body > marshallers.c
+
 if ENABLE_DBUS
 
 CLEANFILES = \
@@ -157,6 +166,8 @@ CLEANFILES = \
 	dbus-client-binding.h \
 	dbus-types.c \
 	dbus-types.h \
+	marshallers.c \
+	marshallers.h \
 	purple-client-bindings.c \
 	purple-client-bindings.h \
 	purple.service
@@ -227,6 +238,8 @@ BUILT_SOURCES = $(purple_builtheaders) \
 	dbus-types.c \
 	dbus-types.h \
 	dbus-bindings.c \
+	marshallers.c \
+	marshallers.h \
 	purple-client-bindings.c \
 	purple-client-bindings.h