Mercurial > pidgin
annotate libpurple/protocols/silc/Makefile.am @ 30432:1cdae196aac8
Standardize on "cancelled".
QuLogic: so, canceled or cancelled? that patch on #12130 is pretty thorough...
wabz: cancelled :D
wabz: that cancelled thing actually bothered me in the past
wabz: never quite enough to do such a patch :p
elb: that's an en_US vs en_GB thing
elb: both are correct, but canceled is more common in en_{US,CA} and cancelled in en_{GB,AU,NZ,etc.}
elb: personally, I use cancelled
QuLogic: yea, that's what I went for before, but I think I couldn't change any strings because we were frozen
QuLogic: you all had to pick the spelling that was opposite from the guy's patch, didn't you...
rekkanoryo: well, considering we're generally en_US in our strings, it should be canceled in our source
elb: considering they're both correct, and while I'm anal retentive, I'm not anal retentive about that, I have no preference ;-)
rekkanoryo: I don't really care either way, I just think that we should be consistently en_US or en_GB throughout
elb: right
elb: my point is, they're both correct for en_US
elb: one 'l' is simply more common
rekkanoryo: ah
rekkanoryo: if they're both technically correct for en_US, then "cancelled" is my vote
rekkanoryo: one 'l' always looks wrong to me
elb: the dictionary claims they are
Sorry, dwc.
Closes #12130.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 23 Aug 2010 01:41:31 +0000 |
parents | e33a91b8b8f6 |
children |
rev | line source |
---|---|
24389
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
1 EXTRA_DIST = \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
2 Makefile.mingw \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
3 README \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
4 TODO |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
5 |
16583
ce049678a67b
soname versioning of libpurple. Should help resolve debian bug 421282
Stu Tomlinson <stu@nosnilmot.com>
parents:
16285
diff
changeset
|
6 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
7 |
24389
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
8 SILCSOURCES = \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
9 buddy.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
10 chat.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
11 ft.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
12 ops.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
13 pk.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
14 silc.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
15 silcpurple.h \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
16 util.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
17 wb.c \ |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
18 wb.h |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
19 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
20 AM_CFLAGS = $(st) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
21 |
15884
c6e563dfaa7a
More s/gaim/pidgin/ and s/gaim/purple/ and make the RPM spec file work a bit
Stu Tomlinson <stu@nosnilmot.com>
parents:
15822
diff
changeset
|
22 libsilcpurple_la_LDFLAGS = -module -avoid-version |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
23 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
24 if STATIC_SILC |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
25 |
15885
53f9f4ebea7a
s/GAIM_STATIC_PRPL/PURPLE_STATIC_PRPL/ in prpl Makefiles
Stu Tomlinson <stu@nosnilmot.com>
parents:
15884
diff
changeset
|
26 st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS) |
24389
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
27 noinst_LTLIBRARIES = libsilcpurple.la |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
28 libsilcpurple_la_SOURCES = $(SILCSOURCES) |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
29 libsilcpurple_la_CFLAGS = $(AM_CFLAGS) |
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
30 libsilcpurple_la_LIBADD = $(SILC_LIBS) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
31 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
32 else |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
33 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
34 st = $(SILC_CFLAGS) |
24389
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
35 pkg_LTLIBRARIES = libsilcpurple.la |
15884
c6e563dfaa7a
More s/gaim/pidgin/ and s/gaim/purple/ and make the RPM spec file work a bit
Stu Tomlinson <stu@nosnilmot.com>
parents:
15822
diff
changeset
|
36 libsilcpurple_la_SOURCES = $(SILCSOURCES) |
26359
e33a91b8b8f6
Clean unnecessary changes out of the Makefiles.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
24967
diff
changeset
|
37 libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
38 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
39 endif |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
40 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
41 AM_CPPFLAGS = \ |
15410
5c329a52367b
More build fixes
Daniel Atallah <daniel.atallah@gmail.com>
parents:
15373
diff
changeset
|
42 -I$(top_srcdir)/libpurple \ |
16754
441945083737
Now that version.h is a generated source file, we need to add
Stu Tomlinson <stu@nosnilmot.com>
parents:
16583
diff
changeset
|
43 -I$(top_builddir)/libpurple \ |
24389
2b62300d2c19
Use libtool to build static archives when --with-static-prpls is passed
Mark Doliner <mark@kingant.net>
parents:
16754
diff
changeset
|
44 $(DEBUG_CFLAGS) \ |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
45 $(GLIB_CFLAGS) \ |
26359
e33a91b8b8f6
Clean unnecessary changes out of the Makefiles.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
24967
diff
changeset
|
46 $(SILC_CFLAGS) |