/soc/2013/ankitkv/gobjectification: acaef37a12be: Re-link libpur...

[Ankit Vani]

Changeset: acaef37a12be093478cbc7fcdc10f19c6d8ec222
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-06-20 23:51 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/acaef37a12be

Description:

Re-link libpurple-ciphers.la to libpurple when it has changed

diffstat:

 libpurple/Makefile.am         |  5 ++++-
 libpurple/ciphers/Makefile.am |  1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (24 lines):

diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -306,7 +306,10 @@ mediaincludedir=$(includedir)/libpurple/
 mediainclude_HEADERS = \
 	$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
 
-libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
+libpurple_la_DEPENDENCIES = \
+	$(STATIC_LINK_LIBS) \
+	ciphers/libpurple-ciphers.la
+
 libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
 libpurple_la_LIBADD = \
 	$(STATIC_LINK_LIBS) \
diff --git a/libpurple/ciphers/Makefile.am b/libpurple/ciphers/Makefile.am
--- a/libpurple/ciphers/Makefile.am
+++ b/libpurple/ciphers/Makefile.am
@@ -1,5 +1,4 @@
 noinst_LTLIBRARIES=libpurple-ciphers.la
-# XXX: cipher.lo won't be updated after a change in cipher files
 
 if USE_NSS
 AES_SOURCE = aescipher.c