/pidgin/main: be00a35f1869: Fix the build
Tomasz Wasilczyk
twasilczyk at pidgin.im
Fri Apr 25 12:41:13 EDT 2014
Changeset: be00a35f1869945fafff5275e2192533eacfc081
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-04-25 18:41 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/be00a35f1869
Description:
Fix the build
diffstat:
libpurple/protocols/jabber/Makefile.am | 12 +++++-------
libpurple/protocols/oscar/Makefile.am | 8 +++++---
libpurple/protocols/yahoo/Makefile.am | 8 +++++---
3 files changed, 15 insertions(+), 13 deletions(-)
diffs (86 lines):
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -119,15 +119,16 @@ libjabber_la_LDFLAGS = @PLUGIN_LDFLAGS@
else
-st =
-pkg_LTLIBRARIES = libfacebook.la libgtalk.la libxmpp.la
-
if IS_WIN32
lib_LTLIBRARIES = libjabber.la
+pkg_LTLIBRARIES =
else
-pkg_LTLIBRARIES += libjabber.la
+pkg_LTLIBRARIES = libjabber.la
endif
+st =
+pkg_LTLIBRARIES += libfacebook.la libgtalk.la libxmpp.la
+
libjabber_la_SOURCES = $(JABBERSOURCES)
libjabber_la_LIBADD = @PURPLE_LIBS@ $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
$(FARSTREAM_LIBS) \
@@ -136,15 +137,12 @@ libjabber_la_LDFLAGS = @PLUGIN_LDFLAGS@
libfacebook_la_SOURCES = libfacebook.c
libfacebook_la_LIBADD = libjabber.la
-libfacebook_la_DEPENDENCIES = libjabber.la
libgtalk_la_SOURCES = libgtalk.c
libgtalk_la_LIBADD = libjabber.la
-libgtalk_la_DEPENDENCIES = libjabber.la
libxmpp_la_SOURCES = libxmpp.c
libxmpp_la_LIBADD = libjabber.la
-libxmpp_la_DEPENDENCIES = libjabber.la
endif
diff --git a/libpurple/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am
--- a/libpurple/protocols/oscar/Makefile.am
+++ b/libpurple/protocols/oscar/Makefile.am
@@ -63,14 +63,16 @@ liboscar_la_LDFLAGS = @PLUGIN_LDFLAGS@
else
-st =
-pkg_LTLIBRARIES = libaim.la libicq.la
if IS_WIN32
lib_LTLIBRARIES = liboscar.la
+pkg_LTLIBRARIES =
else
-pkg_LTLIBRARIES += liboscar.la
+pkg_LTLIBRARIES = liboscar.la
endif
+st =
+pkg_LTLIBRARIES += libaim.la libicq.la
+
liboscar_la_SOURCES = $(OSCARSOURCES)
liboscar_la_LIBADD = @PURPLE_LIBS@
liboscar_la_LDFLAGS = @PLUGIN_LDFLAGS@
diff --git a/libpurple/protocols/yahoo/Makefile.am b/libpurple/protocols/yahoo/Makefile.am
--- a/libpurple/protocols/yahoo/Makefile.am
+++ b/libpurple/protocols/yahoo/Makefile.am
@@ -40,14 +40,16 @@ libymsg_la_LDFLAGS = @PLUGIN_LDFLAGS@
else
-st =
-pkg_LTLIBRARIES = libyahoo.la libyahoojp.la
if IS_WIN32
lib_LTLIBRARIES = libymsg.la
+pkg_LTLIBRARIES =
else
-pkg_LTLIBRARIES += libymsg.la
+pkg_LTLIBRARIES = libymsg.la
endif
+st =
+pkg_LTLIBRARIES += libyahoo.la libyahoojp.la
+
libymsg_la_SOURCES = $(YAHOOSOURCES)
libymsg_la_LIBADD = @PURPLE_LIBS@
libymsg_la_LDFLAGS = @PLUGIN_LDFLAGS@
More information about the Commits
mailing list