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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8489
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
1 EXTRA_DIST = \
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
2 Makefile.mingw
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
3
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
4 pkgdir = $(libdir)/gaim
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
5
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
6 RENDEZVOUSSOURCES = \
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
7 mdns.c \
9252
fe9f4eee3dcb [gaim-migrate @ 10051]
Mark Doliner <mark@kingant.net>
parents: 8738
diff changeset
8 mdns.h \
8738
dbbf5470ba05 [gaim-migrate @ 9493]
Mark Doliner <mark@kingant.net>
parents: 8489
diff changeset
9 mdns_cache.c \
9252
fe9f4eee3dcb [gaim-migrate @ 10051]
Mark Doliner <mark@kingant.net>
parents: 8738
diff changeset
10 mdns_cache.h \
8489
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
11 rendezvous.c
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
12
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
13 AM_CFLAGS = $(st)
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
14
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
15 librendezvous_la_LDFLAGS = -module -avoid-version
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
16
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
17 if STATIC_RENDEZVOUS
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
18
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
19 st = -DGAIM_STATIC_PRPL
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
20 noinst_LIBRARIES = librendezvous.a
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
21 librendezvous_a_SOURCES = $(RENDEZVOUSSOURCES)
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
22 librendezvous_a_CFLAGS = $(AM_CFLAGS)
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
23
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
24 else
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
25
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
26 st =
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
27 pkg_LTLIBRARIES = librendezvous.la
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
28 librendezvous_la_SOURCES = $(RENDEZVOUSSOURCES)
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
29
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
30 endif
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
31
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
32
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
33 AM_CPPFLAGS = \
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
34 -I$(top_srcdir)/src \
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
35 $(GLIB_CFLAGS) \
b06dcc915c45 [gaim-migrate @ 9224]
Mark Doliner <mark@kingant.net>
parents:
diff changeset
36 $(DEBUG_CFLAGS)