annotate src/protocols/toc/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 6b1ecf40f3ba
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6198
fcc28f5dd0c8 [gaim-migrate @ 6684]
Herman Bloggs <hermanator12002@yahoo.com>
parents: 4202
diff changeset
1 EXTRA_DIST = \
fcc28f5dd0c8 [gaim-migrate @ 6684]
Herman Bloggs <hermanator12002@yahoo.com>
parents: 4202
diff changeset
2 PROTOCOL \
fcc28f5dd0c8 [gaim-migrate @ 6684]
Herman Bloggs <hermanator12002@yahoo.com>
parents: 4202
diff changeset
3 Makefile.mingw
2287
1a1d68e12a86 [gaim-migrate @ 2297]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 2086
diff changeset
4
2086
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
5 pkgdir = $(libdir)/gaim
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
6
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
7 TOCSOURCES = toc.c
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
8
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
9 AM_CFLAGS = $(st)
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
10
2894
44140dae2865 [gaim-migrate @ 2907]
Eric Warmenhoven <eric@warmenhoven.org>
parents: 2341
diff changeset
11 libtoc_la_LDFLAGS = -module -avoid-version
2086
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
12
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
13 if STATIC_TOC
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
14
8082
6b1ecf40f3ba [gaim-migrate @ 8781]
Nathan Walp <nwalp@pidgin.im>
parents: 7178
diff changeset
15 st = -DGAIM_STATIC_PRPL
2086
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
16 noinst_LIBRARIES = libtoc.a
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
17 libtoc_a_SOURCES = $(TOCSOURCES)
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
18 libtoc_a_CFLAGS = $(AM_CFLAGS)
3411
5df423e0bca8 [gaim-migrate @ 3430]
Christian Hammond <chipx86@chipx86.com>
parents: 2894
diff changeset
19
2086
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
20 else
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
21
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
22 st =
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
23 pkg_LTLIBRARIES = libtoc.la
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
24 libtoc_la_SOURCES = $(TOCSOURCES)
2086
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
25
424a40f12a6c [gaim-migrate @ 2096]
Eric Warmenhoven <eric@warmenhoven.org>
parents:
diff changeset
26 endif
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
27
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
28 AM_CPPFLAGS = \
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
29 -I$(top_srcdir)/src \
6371
8f94cce8faa5 [gaim-migrate @ 6876]
Christian Hammond <chipx86@chipx86.com>
parents: 6360
diff changeset
30 $(GLIB_CFLAGS) \
4202
59751fe608c5 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
31 $(DEBUG_CFLAGS)