Mercurial > pidgin3 / file diff

--- a/libpurple/Makefile.am	Thu Sep 29 20:11:07 2016 -0500
+++ b/libpurple/Makefile.am	Thu Jun 15 14:22:32 2017 -0500
@@ -40,13 +40,6 @@
 	buddylist.c \
 	buddyicon.c \
 	chat.c \
-	ciphers/aescipher.c \
-	ciphers/descipher.c \
-	ciphers/des3cipher.c \
-	ciphers/md4hash.c \
-	ciphers/pbkdf2cipher.c \
-	ciphers/rc4cipher.c \
-	cipher.c \
 	circularbuffer.c \
 	cmds.c \
 	connection.c \
@@ -133,7 +126,6 @@
 	buddylist.h \
 	buddyicon.h \
 	chat.h \
-	cipher.h \
 	circularbuffer.h \
 	cmds.h \
 	connection.h \
@@ -233,20 +225,11 @@
 	codec.h \
 	enum-types.h
 
-purple_cipherheaders = \
-	aescipher.h \
-	descipher.h \
-	des3cipher.h \
-	md4hash.h \
-	pbkdf2cipher.h \
-	rc4cipher.h
-
 purple_builtheaders = purple.h version.h enums.h marshallers.h
 
 purple_enumheaders = \
 	$(srcdir)/account.h \
 	$(srcdir)/buddyicon.h \
-	$(srcdir)/cipher.h \
 	$(srcdir)/connection.h \
 	$(srcdir)/conversation.h \
 	$(srcdir)/conversationtypes.h \
@@ -319,7 +302,6 @@
 # to not being able to find the enums.h or marshallers.h files if
 # they've already been generated in the $(srcdir).
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
-		$(addprefix $(srcdir)/ciphers/, $(purple_cipherheaders)) \
 		$(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
 		$(filter-out: enums.h marshallers.h, $(purple_builtheaders))
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
@@ -358,7 +340,7 @@
 purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client -o $@ $(dbus_build_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)
+purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported)
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim -o $@ $(purple_build_coreheaders)
 	$(AM_V_at) $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers --append -o $@ $(dbus_build_exported)
 
@@ -420,10 +402,6 @@
 	$(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))
@@ -500,7 +478,6 @@
 if HAVE_INTROSPECTION
 introspection_sources = \
 	$(libpurpleinclude_HEADERS) \
-	$(addprefix ciphers/, $(purple_cipherheaders)) \
 	$(addprefix media/, $(purple_mediaheaders))
 
 Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/libpurple.la