Mercurial > pidgin
annotate src/protocols/rendezvous/Makefile.am @ 9969:cc2e6dd43613
[gaim-migrate @ 10879]
(21:35:19) nosnilmot: LSchiere: gaim_blist_add_group() should not really be
#if 0'd out... does that need a patch?
(21:35:38) LSchiere: why is it #if 0'ed?
(21:35:50) nosnilmot: merging error afaict
(21:35:52) interalia: datallah: talking to yourself is OK. it's when you
answer that it becomes a problem...
(21:35:54) LSchiere: i'm assuming it was done for a reason, temporary as
that reason might be
(21:36:04) nosnilmot: it's not #if 0'd in chip's svn tree
(21:36:08) LSchiere: oddness
(21:36:16) interalia: cvs annotate to the rescue!
(21:36:23) LSchiere: was that part of datallah's patch failure handle
patch?
(21:36:49) datallah: yeah... i'm confused as to how it happened, but the
first part happened during the plain merge and the #endif i added during
the .rej cleanup iirc
(21:37:31) nosnilmot: yup, datallah's right :) I suspect the #if 0 came in
because "patch" was trying to "help"
(21:37:47) LSchiere: okay, let's see what happens without that
(21:38:11) nosnilmot: "it works a lot better and doesn't eat as many buddy
lists for breakfast"
(21:38:12) datallah: it definitely needs to not be commented out
it compiles uncommented, so we'll go with their opinion
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Wed, 08 Sep 2004 01:38:38 +0000 |
| parents | fe9f4eee3dcb |
| children | 8bc7ba019e96 |
| rev | line source |
|---|---|
| 8489 | 1 EXTRA_DIST = \ |
| 2 Makefile.mingw | |
| 3 | |
| 4 pkgdir = $(libdir)/gaim | |
| 5 | |
| 6 RENDEZVOUSSOURCES = \ | |
| 7 mdns.c \ | |
| 9252 | 8 mdns.h \ |
| 8738 | 9 mdns_cache.c \ |
| 9252 | 10 mdns_cache.h \ |
| 8489 | 11 rendezvous.c |
| 12 | |
| 13 AM_CFLAGS = $(st) | |
| 14 | |
| 15 librendezvous_la_LDFLAGS = -module -avoid-version | |
| 16 | |
| 17 if STATIC_RENDEZVOUS | |
| 18 | |
| 19 st = -DGAIM_STATIC_PRPL | |
| 20 noinst_LIBRARIES = librendezvous.a | |
| 21 librendezvous_a_SOURCES = $(RENDEZVOUSSOURCES) | |
| 22 librendezvous_a_CFLAGS = $(AM_CFLAGS) | |
| 23 | |
| 24 else | |
| 25 | |
| 26 st = | |
| 27 pkg_LTLIBRARIES = librendezvous.la | |
| 28 librendezvous_la_SOURCES = $(RENDEZVOUSSOURCES) | |
| 29 | |
| 30 endif | |
| 31 | |
| 32 | |
| 33 AM_CPPFLAGS = \ | |
| 34 -I$(top_srcdir)/src \ | |
| 35 $(GLIB_CFLAGS) \ | |
| 36 $(DEBUG_CFLAGS) |
