Mercurial > pidgin3 / changeset

--- a/ChangeLog	Tue Sep 24 16:55:07 2013 +0530
+++ b/ChangeLog	Tue Sep 24 18:00:29 2013 +0530
@@ -73,6 +73,7 @@
 	General:
 	* Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
 	* Various core components of libpurple are now GObjects.
+	* Ciphers are now built from the libpurple directory.
 	* Added dependency GPlugin, which is now required to build libpurple with
 	  plugins support.
 

--- a/configure.ac	Tue Sep 24 16:55:07 2013 +0530
+++ b/configure.ac	Tue Sep 24 18:00:29 2013 +0530
@@ -2877,7 +2877,6 @@
 		   pidgin/plugins/perl/common/Makefile.PL
 		   pidgin/plugins/ticker/Makefile
 		   pidgin/themes/Makefile
-		   libpurple/ciphers/Makefile
 		   libpurple/example/Makefile
 		   libpurple/gconf/Makefile
 		   libpurple/purple-3.pc

--- a/libpurple/Makefile.am	Tue Sep 24 16:55:07 2013 +0530
+++ b/libpurple/Makefile.am	Tue Sep 24 18:00:29 2013 +0530
@@ -34,7 +34,16 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = purple-3.pc
 
-SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example
+SUBDIRS = $(GCONF_DIR) plugins protocols . tests example
+
+if USE_NSS
+AES_SOURCE = ciphers/aescipher.c
+AES_HEADER = aescipher.h
+endif
+if USE_GNUTLS
+AES_SOURCE = ciphers/aescipher.c
+AES_HEADER = aescipher.h
+endif
 
 purple_coresources = \
 	account.c \
@@ -45,6 +54,16 @@
 	buddylist.c \
 	buddyicon.c \
 	certificate.c \
+	$(AES_SOURCE) \
+	ciphers/descipher.c \
+	ciphers/des3cipher.c \
+	ciphers/hmaccipher.c \
+	ciphers/md4hash.c \
+	ciphers/md5hash.c \
+	ciphers/pbkdf2cipher.c \
+	ciphers/rc4cipher.c \
+	ciphers/sha1hash.c \
+	ciphers/sha256hash.c \
 	cipher.c \
 	circularbuffer.c \
 	cmds.c \
@@ -186,6 +205,18 @@
 	codec.h \
 	enum-types.h
 
+purple_cipherheaders = \
+	$(AES_HEADER) \
+	descipher.h \
+	des3cipher.h \
+	hmaccipher.h \
+	md4hash.h \
+	md5hash.h \
+	pbkdf2cipher.h \
+	rc4cipher.h \
+	sha1hash.h \
+	sha256hash.h
+
 purple_builtheaders = purple.h version.h enums.h marshallers.h
 
 purple_enumheaders = \
@@ -245,6 +276,7 @@
                 server.h util.h xmlnode.h protocol.h protocols.h
 
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
+		$(addprefix $(srcdir)/ciphers/, $(purple_cipherheaders)) \
 		$(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
 		$(purple_builtheaders)
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
@@ -280,7 +312,7 @@
 purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
 	$(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
 
-purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported)
+purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix ciphers/, $(purple_cipherheaders)) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported)
 	$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
 	$(AM_V_at)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
 
@@ -338,13 +370,16 @@
 	$(purple_builtheaders) \
 	$(dbus_headers)
 
+cipherincludedir=$(includedir)/libpurple/ciphers
+cipherinclude_HEADERS = \
+	$(addprefix $(srcdir)/ciphers/, $(purple_cipherheaders))
+
 mediaincludedir=$(includedir)/libpurple/media
 mediainclude_HEADERS = \
 	$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
 
 libpurple_la_DEPENDENCIES = \
-	$(STATIC_LINK_LIBS) \
-	ciphers/libpurple-ciphers.la
+	$(STATIC_LINK_LIBS)
 
 libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
 libpurple_la_LIBADD = \
@@ -363,7 +398,6 @@
 	$(JSON_LIBS) \
 	$(GNUTLS_LIBS) \
 	$(NSS_LIBS) \
-	ciphers/libpurple-ciphers.la \
 	-lm
 
 AM_CPPFLAGS = \
@@ -382,7 +416,9 @@
 	$(GSTINTERFACES_CFLAGS) \
 	$(IDN_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS) \
-	$(JSON_CFLAGS)
+	$(JSON_CFLAGS) \
+	$(GNUTLS_CFLAGS) \
+	$(NSS_CFLAGS)
 
 # INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
 # We want to use SSL_CERTIFICATES_DIR when it's not empty.

--- a/libpurple/ciphers/Makefile.am	Tue Sep 24 16:55:07 2013 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-noinst_LTLIBRARIES=libpurple-ciphers.la
-
-if USE_NSS
-AES_SOURCE = aescipher.c
-endif
-if USE_GNUTLS
-AES_SOURCE = aescipher.c
-endif
-
-libpurple_ciphers_la_SOURCES=\
-	$(AES_SOURCE) \
-	descipher.c \
-	des3cipher.c \
-	hmaccipher.c \
-	md4hash.c \
-	md5hash.c \
-	pbkdf2cipher.c \
-	rc4cipher.c \
-	sha1hash.c \
-	sha256hash.c
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/libpurple \
-	$(INTGG_CFLAGS) \
-	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GPLUGIN_CFLAGS) \
-	$(DEBUG_CFLAGS) \
-	$(GNUTLS_CFLAGS) \
-	$(NSS_CFLAGS)