Mercurial > pidgin
changeset 25270:c2cfb10cc2d9
merge of 'b1fa9aff4c34ce047c572504619d09fd47c9d6be'
and 'b31c4ffa9418149941920d030ef2a6ea8d16975b'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 09 Jan 2009 03:25:05 +0000 |
| parents | c72b77a638a1 (diff) 6c269e0d99ae (current diff) |
| children | 87fb8cca501d |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/Makefile.am Fri Jan 09 03:24:45 2009 +0000 +++ b/libpurple/protocols/sametime/Makefile.am Fri Jan 09 03:25:05 2009 +0000 @@ -8,24 +8,22 @@ SAMETIMESOURCES = sametime.c AM_CFLAGS = \ - $(st) \ - -DG_LOG_DOMAIN=\"sametime\" + $(st) if STATIC_SAMETIME st = -DPURPLE_STATIC_PRPL noinst_LTLIBRARIES = libsametime.la -libsametime_la_SOURCES = $(SAMETIMESOURCES) libsametime_la_CFLAGS = $(AM_CFLAGS) else st = pkg_LTLIBRARIES = libsametime.la -libsametime_la_SOURCES = $(SAMETIMESOURCES) endif +libsametime_la_SOURCES = $(SAMETIMESOURCES) libsametime_la_LDFLAGS = -module -avoid-version libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS) @@ -34,5 +32,6 @@ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ - $(MEANWHILE_CFLAGS) + $(MEANWHILE_CFLAGS) \ + -DG_LOG_DOMAIN=\"sametime\"