Mercurial > pidgin
changeset 23806:e17dbd941380
merge of '0685fc29468269a2af68268baa627b09f83339e4'
and '8222acabc1382453e8dda5b8d507e4df0f0a91ff'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Tue, 27 May 2008 04:55:10 +0000 |
| parents | f47be691e588 (diff) 5f4807116f8c (current diff) |
| children | 7d2e5f57dbca |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/Makefile.am Tue May 27 04:30:36 2008 +0000 +++ b/libpurple/Makefile.am Tue May 27 04:55:10 2008 +0000 @@ -148,7 +148,8 @@ marshallers.c: marshallers.list @echo "Generating marshallers.c" - $(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body > marshallers.c + echo "#include \"marshallers.h\"" > marshallers.c + $(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c if ENABLE_DBUS