libpurple/protocols/zephyr/Makefile.am

Tue, 27 May 2008 01:11:46 +0000

author
Peter O'Gorman <pogma@thewrittenword.com>
date
Tue, 27 May 2008 01:11:46 +0000
changeset 23352
9714223ca7a7
parent 23315
934db4b32b9f
child 23707
480f94157418
child 24609
c119f12de848
permissions
-rw-r--r--

A patch from Peter O'Gorman at The Written Word, Inc. to fix various
portability issues. These changes seemed reasonable, even though I wasn't
able to test or verify them all in particular. Hopefully we don't break
anything on another OS.
Refs #3798


committer: Richard Laager <rlaager@pidgin.im>

16651
218fe51ae7b7 soname versioning of libpurple. Should help resolve debian bug 421282
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16364
diff changeset
1 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
2
4202
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
3 ZEPHYRSOURCES = \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
4 ZAsyncLocate.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
5 ZCkAuth.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
6 ZCkIfNot.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
7 ZClosePort.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
8 ZCmpUID.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
9 ZCmpUIDP.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
10 ZFlsLocs.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
11 ZFlsSubs.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
12 ZFmtAuth.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
13 ZFmtList.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
14 ZFmtNotice.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
15 ZFmtRaw.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
16 ZFmtRawLst.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
17 ZFmtSmRLst.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
18 ZFmtSmRaw.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
19 ZFreeNot.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
20 ZGetLocs.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
21 ZGetSender.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
22 ZGetSubs.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
23 ZGetWGPort.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
24 ZIfNotice.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
25 ZInit.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
26 ZLocations.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
27 ZMakeAscii.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
28 ZMkAuth.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
29 ZNewLocU.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
30 ZOpenPort.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
31 ZParseNot.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
32 ZPeekIfNot.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
33 ZPeekNot.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
34 ZPeekPkt.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
35 ZPending.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
36 ZReadAscii.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
37 ZRecvNot.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
38 ZRecvPkt.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
39 ZRetSubs.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
40 ZSendList.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
41 ZSendNot.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
42 ZSendPkt.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
43 ZSendRLst.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
44 ZSendRaw.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
45 ZSetDest.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
46 ZSetFD.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
47 ZSetSrv.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
48 ZSubs.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
49 ZVariables.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
50 ZWait4Not.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
51 ZhmStat.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
52 Zinternal.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
53 com_err.h \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
54 error_message.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
55 error_table.h \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
56 et_name.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
57 init_et.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
58 internal.h \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
59 mit-copyright.h \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
60 mit-sipb-copyright.h \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
61 sysdep.h \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
62 zephyr_err.c \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
63 zephyr_err.h \
23315
934db4b32b9f When compiling against an external libzephyr, we need to use its zephyr.h,
Richard Laager <rlaager@pidgin.im>
parents: 16810
diff changeset
64 zephyr_internal.h \
4202
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
65 \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
66 zephyr.c
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
67
8378
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
68 ZEPHYRSOURCESEXT = zephyr.c
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
69
4202
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
70 AM_CFLAGS = $(st)
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
71
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
72 ZEPHYRLIBS = $(KRB4_LDFLAGS) $(KRB4_LIBS)
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
73
8378
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
74 ZEPHYRLIBSEXT = $(ZEPHYR_LDFLAGS) $(ZEPHYR_LIBS)
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
75
14736
90fe3dd8e9db [gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 14254
diff changeset
76 libzephyr_la_LDFLAGS = -module -avoid-version
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
77
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
78 if STATIC_ZEPHYR
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
79
15947
15efedafba00 s/GAIM_STATIC_PRPL/PURPLE_STATIC_PRPL/ in prpl Makefiles
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 15523
diff changeset
80 st = -DPURPLE_STATIC_PRPL -Dlint
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
81 noinst_LIBRARIES = libzephyr.a
4202
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
82 libzephyr_a_SOURCES = $(ZEPHYRSOURCES)
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
83 libzephyr_a_CFLAGS = $(AM_CFLAGS)
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
84 libzephyr_a_LIBADD = $(ZEPHYRLIBS)
3411
e9d50336f9c3 [gaim-migrate @ 3430]
Christian Hammond <chipx86@chipx86.com>
parents: 2894
diff changeset
85
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
86 else
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
87
4298
af01cbb94efe [gaim-migrate @ 4552]
Sean Egan <seanegan@pidgin.im>
parents: 4202
diff changeset
88 st = -Dlint
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
89 pkg_LTLIBRARIES = libzephyr.la
8378
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
90
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
91 if EXTERNAL_LIBZEPHYR
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
92 libzephyr_la_SOURCES = $(ZEPHYRSOURCESEXT)
14736
90fe3dd8e9db [gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 14254
diff changeset
93 libzephyr_la_LIBADD = $(GLIB_LIBS) $(ZEPHYRLIBSEXT)
8378
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
94 else
4202
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
95 libzephyr_la_SOURCES = $(ZEPHYRSOURCES)
14736
90fe3dd8e9db [gaim-migrate @ 17420]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 14254
diff changeset
96 libzephyr_la_LIBADD = $(GLIB_LIBS) $(ZEPHYRLIBS)
8378
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
97 endif
593f94d8f12c [gaim-migrate @ 9105]
Arun Tharuvai <aatharuv@mit.edu>
parents: 8082
diff changeset
98
2086
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
99
007508451e2c [gaim-migrate @ 2096]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
diff changeset
100 endif
4202
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
101
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
102 AM_CPPFLAGS = \
6666
191288340518 [gaim-migrate @ 7191]
Christian Hammond <chipx86@chipx86.com>
parents: 6371
diff changeset
103 -I$(top_srcdir) \
15435
4b933b06d75e Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@pidgin.im>
parents: 14736
diff changeset
104 -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
105 -I$(top_builddir)/libpurple \
15435
4b933b06d75e Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@pidgin.im>
parents: 14736
diff changeset
106 -I$(top_srcdir)/libpurple/protocols \
23352
9714223ca7a7 A patch from Peter O'Gorman at The Written Word, Inc. to fix various
Peter O'Gorman <pogma@thewrittenword.com>
parents: 23315
diff changeset
107 -DCONFDIR=\"$(sysconfdir)\" \
6371
e92b66ee5518 [gaim-migrate @ 6876]
Christian Hammond <chipx86@chipx86.com>
parents: 6360
diff changeset
108 $(GLIB_CFLAGS) \
4202
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
109 $(KRB4_CFLAGS) \
8b92de3b1c07 [gaim-migrate @ 4438]
Christian Hammond <chipx86@chipx86.com>
parents: 3411
diff changeset
110 $(DEBUG_CFLAGS)

mercurial