Mercurial > pidgin
changeset 28127:e47d4bddf974
merge of '3f93a6bb49a0b26675a702b5849dc9e6d2fc0200'
and '4bba0dcaaebf221b8408786df7013b2d07b71e9c'
| author | maiku@pidgin.im |
|---|---|
| date | Fri, 28 Aug 2009 23:27:10 +0000 |
| parents | 88f2822da22b (diff) 67e93a042bf9 (current diff) |
| children | d7cfffdd35e6 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/simple/Makefile.am Fri Aug 28 23:27:08 2009 +0000 +++ b/libpurple/protocols/simple/Makefile.am Fri Aug 28 23:27:10 2009 +0000 @@ -13,7 +13,7 @@ libsimple_la_LDFLAGS = -module -avoid-version -if STATIC_MSN +if STATIC_SIMPLE st = -DPURPLE_STATIC_PRPL noinst_LTLIBRARIES = libsimple.la
--- a/pidgin/plugins/Makefile.am Fri Aug 28 23:27:08 2009 +0000 +++ b/pidgin/plugins/Makefile.am Fri Aug 28 23:27:10 2009 +0000 @@ -93,7 +93,7 @@ themeedit_la_SOURCES = themeedit.c themeedit-icon.c themeedit-icon.h timestamp_la_SOURCES = timestamp.c timestamp_format_la_SOURCES = timestamp_format.c -vvconfig_SOURCES = vvconfig.c +vvconfig_la_SOURCES = vvconfig.c xmppconsole_la_SOURCES = xmppconsole.c convcolors_la_LIBADD = $(GTK_LIBS)