Mercurial > pidgin
comparison libpurple/protocols/jabber/Makefile.am @ 32771:52fb2e955198
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 6ee8e5cba5c96a1f2171038180b636724b258817)
to branch 'im.pidgin.pidgin' (head 92cc5e21737e6702460525c581295fdd26a2380f)
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Fri, 13 Apr 2012 07:39:04 +0000 |
parents | eca1f14826e5 |
children |
comparison
equal
deleted
inserted
replaced
32770:1e0ded0cb2ee | 32771:52fb2e955198 |
---|---|
101 | 101 |
102 if STATIC_JABBER | 102 if STATIC_JABBER |
103 | 103 |
104 st = -DPURPLE_STATIC_PRPL | 104 st = -DPURPLE_STATIC_PRPL |
105 noinst_LTLIBRARIES = libjabber.la | 105 noinst_LTLIBRARIES = libjabber.la |
106 libjabber_la_SOURCES = $(JABBERSOURCES) libxmpp.c | 106 libjabber_la_SOURCES = $(JABBERSOURCES) libfacebook.c libgtalk.c libxmpp.c |
107 libjabber_la_CFLAGS = $(AM_CFLAGS) | 107 libjabber_la_CFLAGS = $(AM_CFLAGS) |
108 | 108 |
109 else | 109 else |
110 | 110 |
111 st = | 111 st = |
112 pkg_LTLIBRARIES = libjabber.la libxmpp.la | 112 pkg_LTLIBRARIES = libjabber.la libfacebook.la libgtalk.la libxmpp.la |
113 libjabber_la_SOURCES = $(JABBERSOURCES) | 113 libjabber_la_SOURCES = $(JABBERSOURCES) |
114 libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\ | 114 libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\ |
115 $(FARSIGHT_LIBS) \ | 115 $(FARSIGHT_LIBS) \ |
116 $(GSTREAMER_LIBS) \ | 116 $(GSTREAMER_LIBS) \ |
117 $(GSTINTERFACES_LIBS) | 117 $(GSTINTERFACES_LIBS) |
118 | |
119 libfacebook_la_SOURCES = libfacebook.c | |
120 libfacebook_la_LIBADD = libjabber.la | |
121 | |
122 libgtalk_la_SOURCES = libgtalk.c | |
123 libgtalk_la_LIBADD = libjabber.la | |
118 | 124 |
119 libxmpp_la_SOURCES = libxmpp.c | 125 libxmpp_la_SOURCES = libxmpp.c |
120 libxmpp_la_LIBADD = libjabber.la | 126 libxmpp_la_LIBADD = libjabber.la |
121 | 127 |
122 endif | 128 endif |