Mercurial > pidgin.yaz
annotate Makefile.am @ 29818:2c95b7c57ebb
Fix up the X-Status code in many ways:
* Clean up the descriptions to be consistently of the form, "I am _____."
* Properly mark the descriptions for translation.
* Utilize the files from small smiley theme as much as possible. Through
a Makefile rule, they will be copied from emotes/small/16/ to
emblems/16 at build time and then installed as usual. This is slightly
hackish, but ensures that our icons are consistent and saves manual
copying work and duplication of source files in the repository.
+ As part of this, mobile.png was moved to emotes/small/16, as it is
needed in both places.
* Call these things "Custom Status Icon"s (adding "Status") in the UI.
* Add icqmood0 = shopping, based on testing with ICQ6. Thanks John!!!
* Change the xstatus_crap icon to xstatus_typing to match ICQ 6. The other
typing icon was left alone, except that the name was set to NULL so we
wouldn't get duplicates in the list.
* Change the xstatus_iron (Pro7 TV icon) to xstatus_suit, using the 'person
wearing a suit' icon from N3fr0n to match ICQ6. I named this icon,
somewhat arbitrarily, "At the office".
* The PDA icon is now the same as the hiptop, but hopefully that won't cause
any confusion. Also, the custom icon is now higher priority than the
hiptop icon.
* The music icon is the ("tune") emblem, not the emoticon. This seems more
consistent, given that we're talking about buddy list emblems.
* The "Googling" icon has been renamed to "Searching the web" to avoid the
trademark.
* The "zzz" icon is now an icon for smoking, which seems to fit with the
official client's icon as posted in #4508. Other clients may show a
marijuana leaf. Oh well.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Nov 2008 08:39:34 +0000 |
parents | b31d2ca01b7a |
children | e5efa83aa6d2 d1a4088528ce |
rev | line source |
---|---|
15604 | 1 EXTRA_DIST = \ |
7960 | 2 COPYRIGHT \ |
14506 | 3 ChangeLog.API \ |
4 ChangeLog.win32 \ | |
6198
fcc28f5dd0c8
[gaim-migrate @ 6684]
Herman Bloggs <hermanator12002@yahoo.com>
parents:
6187
diff
changeset
|
5 Doxyfile.in \ |
14506 | 6 HACKING \ |
7 Makefile.mingw \ | |
8 PLUGIN_HOWTO \ | |
16176
83ec0b408926
Beat some older documentation into submission.
Richard Laager <rlaager@wiktel.com>
parents:
16144
diff
changeset
|
9 README.MTN \ |
14506 | 10 README.mingw \ |
15905
6f04fe174f40
Change some stuff from gaim to pidgin
Mark Doliner <mark@kingant.net>
parents:
15888
diff
changeset
|
11 config.h.mingw \ |
21712
19ad2242c06d
bdheeman pointed out on IRC that doxy2devhelp.xsl is not in EXTRA_DIST; let's
Will Thompson <will.thompson@collabora.co.uk>
parents:
21330
diff
changeset
|
12 doxy2devhelp.xsl \ |
9364 | 13 gaim.pc.in \ |
15885
c6e563dfaa7a
More s/gaim/pidgin/ and s/gaim/purple/ and make the RPM spec file work a bit
Stu Tomlinson <stu@nosnilmot.com>
parents:
15818
diff
changeset
|
14 gaim-uninstalled.pc.in \ |
13179
5adc0c9da9f3
[gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
12299
diff
changeset
|
15 intltool-extract.in \ |
5adc0c9da9f3
[gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
12299
diff
changeset
|
16 intltool-merge.in \ |
5adc0c9da9f3
[gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
12299
diff
changeset
|
17 intltool-update.in \ |
15905
6f04fe174f40
Change some stuff from gaim to pidgin
Mark Doliner <mark@kingant.net>
parents:
15888
diff
changeset
|
18 pidgin.apspec.in \ |
6f04fe174f40
Change some stuff from gaim to pidgin
Mark Doliner <mark@kingant.net>
parents:
15888
diff
changeset
|
19 pidgin.spec.in \ |
6f04fe174f40
Change some stuff from gaim to pidgin
Mark Doliner <mark@kingant.net>
parents:
15888
diff
changeset
|
20 pidgin.desktop.in \ |
16613
96b7bc5569aa
The valgrind suppressions file would be useful to people developing from a
Richard Laager <rlaager@wiktel.com>
parents:
16547
diff
changeset
|
21 po/Makefile.mingw \ |
96b7bc5569aa
The valgrind suppressions file would be useful to people developing from a
Richard Laager <rlaager@wiktel.com>
parents:
16547
diff
changeset
|
22 valgrind-suppressions |
0 | 23 |
14652 | 24 noinst_HEADERS = config.h |
9364 | 25 |
15885
c6e563dfaa7a
More s/gaim/pidgin/ and s/gaim/purple/ and make the RPM spec file work a bit
Stu Tomlinson <stu@nosnilmot.com>
parents:
15818
diff
changeset
|
26 dist-hook: pidgin.spec |
c6e563dfaa7a
More s/gaim/pidgin/ and s/gaim/purple/ and make the RPM spec file work a bit
Stu Tomlinson <stu@nosnilmot.com>
parents:
15818
diff
changeset
|
27 cp pidgin.spec $(distdir) |
14750
2a7700895952
[gaim-migrate @ 17507]
Daniel Atallah <daniel.atallah@gmail.com>
parents:
14652
diff
changeset
|
28 rm $(distdir)/config.h |
3449
8c6950b6eb82
[gaim-migrate @ 3493]
Christian Hammond <chipx86@chipx86.com>
parents:
3439
diff
changeset
|
29 |
16660
9b47e29ba76c
Step one of N for making 'make distcheck' happy. GtkUI.pm was renamed
Stu Tomlinson <stu@nosnilmot.com>
parents:
16613
diff
changeset
|
30 distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
14794
diff
changeset
|
31 # cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common |
6701
b7e113a59b51
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6596
diff
changeset
|
32 |
24305
b31d2ca01b7a
applied changes from 84461a44ffa2c1e7ab026455c5463a9763f64a9d
Richard Laager <rlaager@wiktel.com>
parents:
24246
diff
changeset
|
33 commit-check: |
b31d2ca01b7a
applied changes from 84461a44ffa2c1e7ab026455c5463a9763f64a9d
Richard Laager <rlaager@wiktel.com>
parents:
24246
diff
changeset
|
34 (cd po ; intltool-update -m 2>&1 | grep -v '^mismatched quotes.*\.py$$' | sed "s|current directory|po directory|" | grep . ; if [ $$? = 0 ] ; then exit 1 ; else exit 0 ; fi) |
b31d2ca01b7a
applied changes from 84461a44ffa2c1e7ab026455c5463a9763f64a9d
Richard Laager <rlaager@wiktel.com>
parents:
24246
diff
changeset
|
35 LC_ALL=C sort -c -t/ -u po/POTFILES.in |
b31d2ca01b7a
applied changes from 84461a44ffa2c1e7ab026455c5463a9763f64a9d
Richard Laager <rlaager@wiktel.com>
parents:
24246
diff
changeset
|
36 LC_ALL=C sort -c -t/ -u po/POTFILES.skip |
b31d2ca01b7a
applied changes from 84461a44ffa2c1e7ab026455c5463a9763f64a9d
Richard Laager <rlaager@wiktel.com>
parents:
24246
diff
changeset
|
37 |
b31d2ca01b7a
applied changes from 84461a44ffa2c1e7ab026455c5463a9763f64a9d
Richard Laager <rlaager@wiktel.com>
parents:
24246
diff
changeset
|
38 version-check: commit-check |
23896
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
39 # We don't want to release development versions. |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
40 test x`echo $(PACKAGE_VERSION) | grep dev` = x |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
41 |
24246
cb0aa91430bb
disapproval of revision '4f931125ffce24ace6bf298cc58d620c1a975aa1'
Stu Tomlinson <stu@nosnilmot.com>
parents:
24245
diff
changeset
|
42 # Make sure there is a NEWS entry for this version |
cb0aa91430bb
disapproval of revision '4f931125ffce24ace6bf298cc58d620c1a975aa1'
Stu Tomlinson <stu@nosnilmot.com>
parents:
24245
diff
changeset
|
43 head NEWS | grep "^$(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" > /dev/null |
cb0aa91430bb
disapproval of revision '4f931125ffce24ace6bf298cc58d620c1a975aa1'
Stu Tomlinson <stu@nosnilmot.com>
parents:
24245
diff
changeset
|
44 |
cb0aa91430bb
disapproval of revision '4f931125ffce24ace6bf298cc58d620c1a975aa1'
Stu Tomlinson <stu@nosnilmot.com>
parents:
24245
diff
changeset
|
45 # Ensure NEWS has no spaces at the start of a line. |
cb0aa91430bb
disapproval of revision '4f931125ffce24ace6bf298cc58d620c1a975aa1'
Stu Tomlinson <stu@nosnilmot.com>
parents:
24245
diff
changeset
|
46 # Using spaces instead of tabs there is a common mistake. |
cb0aa91430bb
disapproval of revision '4f931125ffce24ace6bf298cc58d620c1a975aa1'
Stu Tomlinson <stu@nosnilmot.com>
parents:
24245
diff
changeset
|
47 test x`grep "^ " NEWS` = x |
cb0aa91430bb
disapproval of revision '4f931125ffce24ace6bf298cc58d620c1a975aa1'
Stu Tomlinson <stu@nosnilmot.com>
parents:
24245
diff
changeset
|
48 |
23896
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
49 # When doing a new minor (or major) release (X.Y.0), there must be a section in |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
50 # ChangeLog.API. |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
51 echo $(PACKAGE_VERSION) | grep -v "^[0-9]\+\.[0-9]\+\.0$$" >/dev/null || head ChangeLog.API | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
52 |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
53 # For all releases, check the ChangeLogs. |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
54 head ChangeLog | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
55 head ChangeLog.win32 | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null |
24183
b8fd4f37f9b2
po/ChangeLog doesn't include dates
Stu Tomlinson <stu@nosnilmot.com>
parents:
24179
diff
changeset
|
56 head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null |
23896
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
57 |
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
58 # Ensure we're working from a tag... |
23893
d64673562530
Verify monotone tag and workspace version on 'make packages'.
Ethan Blanton <elb@pidgin.im>
parents:
23892
diff
changeset
|
59 test x`mtn automate select t:v$(PACKAGE_VERSION)` = x`mtn automate get_base_revision_id` |
23896
6c8be58d0d04
Add some more code to the version-check target to test the ChangeLog files
Richard Laager <rlaager@wiktel.com>
parents:
23894
diff
changeset
|
60 # ... and have no changes in the working copy. |
23893
d64673562530
Verify monotone tag and workspace version on 'make packages'.
Ethan Blanton <elb@pidgin.im>
parents:
23892
diff
changeset
|
61 test x`mtn diff | grep -v '^#'` = x |
d64673562530
Verify monotone tag and workspace version on 'make packages'.
Ethan Blanton <elb@pidgin.im>
parents:
23892
diff
changeset
|
62 |
24174
27556c2710e3
Run the (relatively quick) version check before the (painfully long)
Stu Tomlinson <stu@nosnilmot.com>
parents:
23896
diff
changeset
|
63 release: version-check distcheck packages |
23892
111b464f6845
Add release-time candy 'make release' and 'make packages' to the Makefile.
Ethan Blanton <elb@pidgin.im>
parents:
22565
diff
changeset
|
64 |
24174
27556c2710e3
Run the (relatively quick) version check before the (painfully long)
Stu Tomlinson <stu@nosnilmot.com>
parents:
23896
diff
changeset
|
65 packages: |
23892
111b464f6845
Add release-time candy 'make release' and 'make packages' to the Makefile.
Ethan Blanton <elb@pidgin.im>
parents:
22565
diff
changeset
|
66 gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz |
111b464f6845
Add release-time candy 'make release' and 'make packages' to the Makefile.
Ethan Blanton <elb@pidgin.im>
parents:
22565
diff
changeset
|
67 gpg -ab pidgin-$(PACKAGE_VERSION).tar.bz2 |
111b464f6845
Add release-time candy 'make release' and 'make packages' to the Makefile.
Ethan Blanton <elb@pidgin.im>
parents:
22565
diff
changeset
|
68 gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz |
111b464f6845
Add release-time candy 'make release' and 'make packages' to the Makefile.
Ethan Blanton <elb@pidgin.im>
parents:
22565
diff
changeset
|
69 gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2 |
111b464f6845
Add release-time candy 'make release' and 'make packages' to the Makefile.
Ethan Blanton <elb@pidgin.im>
parents:
22565
diff
changeset
|
70 |
21858
42cf060f1c76
Don't install pidgin.desktop when not installing Pidgin
Sean Egan <seanegan@gmail.com>
parents:
21805
diff
changeset
|
71 if ENABLE_GTK |
5253
2c9de5ae24a0
[gaim-migrate @ 5625]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
72 appsdir = $(datadir)/applications |
15479 | 73 apps_in_files = pidgin.desktop.in |
13179
5adc0c9da9f3
[gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
12299
diff
changeset
|
74 apps_DATA = $(apps_in_files:.desktop.in=.desktop) |
5adc0c9da9f3
[gaim-migrate @ 15542]
Richard Laager <rlaager@wiktel.com>
parents:
12299
diff
changeset
|
75 @INTLTOOL_DESKTOP_RULE@ |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
14794
diff
changeset
|
76 GTK_DIR=pidgin |
14191
009db0b357b5
This is a hand-crafted commit to migrate across subversion revisions
Ethan Blanton <elb@pidgin.im>
parents:
13490
diff
changeset
|
77 endif |
009db0b357b5
This is a hand-crafted commit to migrate across subversion revisions
Ethan Blanton <elb@pidgin.im>
parents:
13490
diff
changeset
|
78 |
009db0b357b5
This is a hand-crafted commit to migrate across subversion revisions
Ethan Blanton <elb@pidgin.im>
parents:
13490
diff
changeset
|
79 if ENABLE_GNT |
15818
0e3a8505ebbe
renamed gaim-text to finch
Sean Egan <seanegan@gmail.com>
parents:
15752
diff
changeset
|
80 GNT_DIR=finch |
14191
009db0b357b5
This is a hand-crafted commit to migrate across subversion revisions
Ethan Blanton <elb@pidgin.im>
parents:
13490
diff
changeset
|
81 endif |
009db0b357b5
This is a hand-crafted commit to migrate across subversion revisions
Ethan Blanton <elb@pidgin.im>
parents:
13490
diff
changeset
|
82 |
22565
0085d8b80bc4
For the few of us who wanted it, I bring back --disable-nls! It may not be
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22383
diff
changeset
|
83 if INSTALL_I18N |
0085d8b80bc4
For the few of us who wanted it, I bring back --disable-nls! It may not be
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22383
diff
changeset
|
84 PO_DIR=po |
0085d8b80bc4
For the few of us who wanted it, I bring back --disable-nls! It may not be
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22383
diff
changeset
|
85 endif |
0085d8b80bc4
For the few of us who wanted it, I bring back --disable-nls! It may not be
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22383
diff
changeset
|
86 |
0085d8b80bc4
For the few of us who wanted it, I bring back --disable-nls! It may not be
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22383
diff
changeset
|
87 SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros $(PO_DIR) share/ca-certs share/sounds |
4554
fbf9f873abfc
[gaim-migrate @ 4834]
Christian Hammond <chipx86@chipx86.com>
parents:
3726
diff
changeset
|
88 |
6596
dcb336f3d9a6
[gaim-migrate @ 7120]
Christian Hammond <chipx86@chipx86.com>
parents:
6411
diff
changeset
|
89 docs: Doxyfile |
10925
993db24dae16
[gaim-migrate @ 12696]
Gary Kramlich <grim@reaperworld.com>
parents:
10362
diff
changeset
|
90 if HAVE_DOXYGEN |
993db24dae16
[gaim-migrate @ 12696]
Gary Kramlich <grim@reaperworld.com>
parents:
10362
diff
changeset
|
91 @echo "Running doxygen..." |
4554
fbf9f873abfc
[gaim-migrate @ 4834]
Christian Hammond <chipx86@chipx86.com>
parents:
3726
diff
changeset
|
92 @doxygen |
20912
f34539eb7a61
Add some xsl magic to generate a .devhelp index from doxygen's XML output,
Will Thompson <will.thompson@collabora.co.uk>
parents:
19115
diff
changeset
|
93 if HAVE_XSLTPROC |
f34539eb7a61
Add some xsl magic to generate a .devhelp index from doxygen's XML output,
Will Thompson <will.thompson@collabora.co.uk>
parents:
19115
diff
changeset
|
94 @echo "Generating devhelp index..." |
21805
1ba8e97ca24c
Ari noticed that `make docs` no longer functions properly when the build
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
21712
diff
changeset
|
95 @xsltproc $(top_srcdir)/doxy2devhelp.xsl doc/xml/index.xml > doc/html/pidgin.devhelp |
20912
f34539eb7a61
Add some xsl magic to generate a .devhelp index from doxygen's XML output,
Will Thompson <will.thompson@collabora.co.uk>
parents:
19115
diff
changeset
|
96 @echo "(Symlink doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)" |
f34539eb7a61
Add some xsl magic to generate a .devhelp index from doxygen's XML output,
Will Thompson <will.thompson@collabora.co.uk>
parents:
19115
diff
changeset
|
97 else |
f34539eb7a61
Add some xsl magic to generate a .devhelp index from doxygen's XML output,
Will Thompson <will.thompson@collabora.co.uk>
parents:
19115
diff
changeset
|
98 @echo "Not generating devhelp index: xsltproc was not found by configure" |
f34539eb7a61
Add some xsl magic to generate a .devhelp index from doxygen's XML output,
Will Thompson <will.thompson@collabora.co.uk>
parents:
19115
diff
changeset
|
99 endif |
10925
993db24dae16
[gaim-migrate @ 12696]
Gary Kramlich <grim@reaperworld.com>
parents:
10362
diff
changeset
|
100 else |
993db24dae16
[gaim-migrate @ 12696]
Gary Kramlich <grim@reaperworld.com>
parents:
10362
diff
changeset
|
101 @echo "doxygen was not found during configure. Aborting." |
993db24dae16
[gaim-migrate @ 12696]
Gary Kramlich <grim@reaperworld.com>
parents:
10362
diff
changeset
|
102 @echo; |
993db24dae16
[gaim-migrate @ 12696]
Gary Kramlich <grim@reaperworld.com>
parents:
10362
diff
changeset
|
103 endif |
11862 | 104 |
105 # perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which | |
106 # breaks "make distcheck" unless we ignore perl things | |
107 | |
108 distuninstallcheck_listfiles = \ | |
15888
8a2e7b406b4e
One step towards passing "make distcheck"
Stu Tomlinson <stu@nosnilmot.com>
parents:
15885
diff
changeset
|
109 find . -type f -print | grep -v perl | grep -v Purple.3pm |
12299 | 110 |
15912
88d626a179a6
Rename our schemas file and update the url handler to point to the
Mark Doliner <mark@kingant.net>
parents:
15905
diff
changeset
|
111 DISTCLEANFILES= pidgin.desktop libpurple/gconf/purple.schemas intltool-extract \ |
14769
61aa08fcd315
[gaim-migrate @ 17527]
Luke Schierer <lschiere@pidgin.im>
parents:
14764
diff
changeset
|
112 intltool-merge intltool-update |