annotate src/protocols/silc/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 3547fd2af609
children 2cc05a9e944d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9353
b8138f3959dc [gaim-migrate @ 10161]
Ethan Blanton <elb@pidgin.im>
parents: 9061
diff changeset
1 EXTRA_DIST = README TODO Makefile.mingw
8849
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
2
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
3 pkgdir = $(libdir)/gaim
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
4
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
5 SILCSOURCES = silc.c silcgaim.h buddy.c chat.c ft.c ops.c pk.c util.c
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
6
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
7 AM_CFLAGS = $(st)
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
8
9061
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
9 libsilcgaim_la_LDFLAGS = -module -avoid-version
8849
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
10
8857
15ddfb03f4c7 [gaim-migrate @ 9625]
Ethan Blanton <elb@pidgin.im>
parents: 8849
diff changeset
11 if STATIC_SILC
8849
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
12
9905
3547fd2af609 [gaim-migrate @ 10797]
Luke Schierer <lschiere@pidgin.im>
parents: 9353
diff changeset
13 st = -DGAIM_STATIC_PRPL $(SILC_CFLAGS)
9061
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
14 noinst_LIBRARIES = libsilcgaim.a
8849
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
15 pkg_LTLIBRARIES =
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
16
9061
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
17 libsilcgaim_a_SOURCES = $(SILCSOURCES)
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
18 libsilcgaim_a_CFLAGS = $(AM_CFLAGS)
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
19 libsilcgaim_a_LIBADD = $(SILC_LIBS)
8849
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
20
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
21 else
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
22
9905
3547fd2af609 [gaim-migrate @ 10797]
Luke Schierer <lschiere@pidgin.im>
parents: 9353
diff changeset
23 st = $(SILC_CFLAGS)
9061
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
24 pkg_LTLIBRARIES = libsilcgaim.la
8849
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
25 noinst_LIBRARIES =
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
26
9061
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
27 libsilcgaim_la_SOURCES = $(SILCSOURCES)
710302dae4e6 [gaim-migrate @ 9837]
Ethan Blanton <elb@pidgin.im>
parents: 8857
diff changeset
28 libsilcgaim_la_LIBADD = $(SILC_LIBS)
8849
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
29
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
30 endif
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
31
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
32 AM_CPPFLAGS = \
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
33 -I$(top_srcdir)/src \
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
34 $(GLIB_CFLAGS) \
50d0f76639e7 [gaim-migrate @ 9616]
Ethan Blanton <elb@pidgin.im>
parents:
diff changeset
35 $(DEBUG_CFLAGS)