Mercurial > pidgin
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 |
| rev | line source |
|---|---|
| 9353 | 1 EXTRA_DIST = README TODO Makefile.mingw |
| 8849 | 2 |
| 3 pkgdir = $(libdir)/gaim | |
| 4 | |
| 5 SILCSOURCES = silc.c silcgaim.h buddy.c chat.c ft.c ops.c pk.c util.c | |
| 6 | |
| 7 AM_CFLAGS = $(st) | |
| 8 | |
| 9061 | 9 libsilcgaim_la_LDFLAGS = -module -avoid-version |
| 8849 | 10 |
| 8857 | 11 if STATIC_SILC |
| 8849 | 12 |
| 9905 | 13 st = -DGAIM_STATIC_PRPL $(SILC_CFLAGS) |
| 9061 | 14 noinst_LIBRARIES = libsilcgaim.a |
| 8849 | 15 pkg_LTLIBRARIES = |
| 16 | |
| 9061 | 17 libsilcgaim_a_SOURCES = $(SILCSOURCES) |
| 18 libsilcgaim_a_CFLAGS = $(AM_CFLAGS) | |
| 19 libsilcgaim_a_LIBADD = $(SILC_LIBS) | |
| 8849 | 20 |
| 21 else | |
| 22 | |
| 9905 | 23 st = $(SILC_CFLAGS) |
| 9061 | 24 pkg_LTLIBRARIES = libsilcgaim.la |
| 8849 | 25 noinst_LIBRARIES = |
| 26 | |
| 9061 | 27 libsilcgaim_la_SOURCES = $(SILCSOURCES) |
| 28 libsilcgaim_la_LIBADD = $(SILC_LIBS) | |
| 8849 | 29 |
| 30 endif | |
| 31 | |
| 32 AM_CPPFLAGS = \ | |
| 33 -I$(top_srcdir)/src \ | |
| 34 $(GLIB_CFLAGS) \ | |
| 35 $(DEBUG_CFLAGS) |
