Tue, 24 Mar 2009 03:38:21 +0000
Clean unnecessary changes out of the Makefiles.
|
7231
6af2d1e09b34
[gaim-migrate @ 7803]
Herman Bloggs <herman@bluedigits.com>
parents:
7044
diff
changeset
|
1 | EXTRA_DIST = \ |
|
6af2d1e09b34
[gaim-migrate @ 7803]
Herman Bloggs <herman@bluedigits.com>
parents:
7044
diff
changeset
|
2 | Makefile.mingw |
|
6af2d1e09b34
[gaim-migrate @ 7803]
Herman Bloggs <herman@bluedigits.com>
parents:
7044
diff
changeset
|
3 | |
|
16651
218fe51ae7b7
soname versioning of libpurple. Should help resolve debian bug 421282
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16364
diff
changeset
|
4 | plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) |
| 7016 | 5 | |
|
14736
90fe3dd8e9db
[gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
6 | ssl_la_LDFLAGS = -module -avoid-version |
|
90fe3dd8e9db
[gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
7 | ssl_gnutls_la_LDFLAGS = -module -avoid-version |
|
90fe3dd8e9db
[gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
8 | ssl_nss_la_LDFLAGS = -module -avoid-version |
| 7016 | 9 | |
| 10 | if PLUGINS | |
| 11 | ||
|
24513
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
12 | # I'm sorry to report that Automake Conditionals don't support |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
13 | # if USE_GNUTLS && USE_NSS |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
14 | # but only support testing a single variable. Hence: |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
15 | |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
16 | if USE_GNUTLS |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
17 | if USE_NSS |
| 7016 | 18 | plugin_LTLIBRARIES = \ |
| 19 | ssl.la \ | |
| 20 | ssl-gnutls.la \ | |
| 21 | ssl-nss.la | |
|
24513
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
22 | else |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
23 | plugin_LTLIBRARIES = \ |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
24 | ssl.la \ |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
25 | ssl-gnutls.la |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
26 | endif |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
27 | else |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
28 | if USE_NSS |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
29 | plugin_LTLIBRARIES = \ |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
30 | ssl.la \ |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
31 | ssl-nss.la |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
32 | else |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
33 | plugin_LTLIBRARIES = \ |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
34 | ssl.la |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
35 | endif |
|
9bdc90668551
Only build SSL plugins if the corresponding library is present.
Will Thompson <resiak@pidgin.im>
parents:
16810
diff
changeset
|
36 | endif |
| 7016 | 37 | |
| 38 | ssl_la_SOURCES = ssl.c | |
| 39 | ssl_gnutls_la_SOURCES = ssl-gnutls.c | |
| 40 | ssl_nss_la_SOURCES = ssl-nss.c | |
| 41 | ||
|
14736
90fe3dd8e9db
[gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
42 | ssl_la_LIBADD = $(GLIB_LIBS) |
|
90fe3dd8e9db
[gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
43 | ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS) |
|
90fe3dd8e9db
[gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
44 | ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) |
| 7016 | 45 | |
| 46 | endif # PLUGINS | |
| 47 | ||
| 48 | AM_CPPFLAGS = \ | |
| 49 | -DDATADIR=\"$(datadir)\" \ | |
|
15948
ea5f00c29150
A couple more gaims bite the dust
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15869
diff
changeset
|
50 | -DLIBDIR=\"$(libdir)/libpurple\" \ |
|
15435
4b933b06d75e
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@pidgin.im>
parents:
14736
diff
changeset
|
51 | -I$(top_srcdir)/libpurple \ |
|
16810
7f257f18af06
Now that version.h is a generated source file, we need to add
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16651
diff
changeset
|
52 | -I$(top_builddir)/libpurple \ |
| 7016 | 53 | $(DEBUG_CFLAGS) \ |
|
14253
b63ebf84c42b
This is a hand-crafted commit to migrate across subversion revisions
Ethan Blanton <elb@pidgin.im>
parents:
10889
diff
changeset
|
54 | $(GLIB_CFLAGS) \ |
|
15869
58b1ee2fb819
Only use gnutls and nss CFLAGS for the relevant plugins, not for all SSL
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15523
diff
changeset
|
55 | $(PLUGIN_CFLAGS) |
|
58b1ee2fb819
Only use gnutls and nss CFLAGS for the relevant plugins, not for all SSL
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15523
diff
changeset
|
56 | |
|
58b1ee2fb819
Only use gnutls and nss CFLAGS for the relevant plugins, not for all SSL
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15523
diff
changeset
|
57 | ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS) |
|
58b1ee2fb819
Only use gnutls and nss CFLAGS for the relevant plugins, not for all SSL
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15523
diff
changeset
|
58 | ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS) |