Merge gnutls_compress_int.? with gnutls_compress.?.

1 files changed, 18 insertions, 20 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1571860857..4dfdb5de7d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -73,19 +73,18 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c	\
 	gnutls_buffers.c gnutls_handshake.c gnutls_num.c		\
 	gnutls_errors.c gnutls_algorithms.c gnutls_dh.c gnutls_kx.c	\
 	gnutls_priority.c gnutls_hash_int.c gnutls_cipher_int.c		\
-	gnutls_compress_int.c gnutls_session.c gnutls_db.c x509_b64.c	\
-	auth_anon.c gnutls_extensions.c gnutls_auth.c			\
-	gnutls_v2_compat.c gnutls_datum.c auth_rsa.c			\
-	gnutls_session_pack.c gnutls_mpi.c gnutls_pk.c gnutls_cert.c	\
-	gnutls_global.c gnutls_constate.c gnutls_anon_cred.c		\
-	pkix_asn1_tab.c gnutls_asn1_tab.c gnutls_mem.c auth_cert.c	\
-	gnutls_ui.c gnutls_sig.c auth_dhe.c gnutls_dh_primes.c		\
-	ext_max_record.c gnutls_alert.c gnutls_str.c gnutls_state.c	\
-	gnutls_x509.c ext_cert_type.c gnutls_rsa_export.c		\
-	auth_rsa_export.c ext_server_name.c auth_dh_common.c		\
-	gnutls_helper.c gnutls_supplemental.c crypto.c random.c		\
-	pk-libgcrypt.c mpi-libgcrypt.c rnd-libgcrypt.c			\
-	cipher-libgcrypt.c mac-libgcrypt.c
+	gnutls_session.c gnutls_db.c x509_b64.c auth_anon.c		\
+	gnutls_extensions.c gnutls_auth.c gnutls_v2_compat.c		\
+	gnutls_datum.c auth_rsa.c gnutls_session_pack.c gnutls_mpi.c	\
+	gnutls_pk.c gnutls_cert.c gnutls_global.c gnutls_constate.c	\
+	gnutls_anon_cred.c pkix_asn1_tab.c gnutls_asn1_tab.c		\
+	gnutls_mem.c auth_cert.c gnutls_ui.c gnutls_sig.c auth_dhe.c	\
+	gnutls_dh_primes.c ext_max_record.c gnutls_alert.c		\
+	gnutls_str.c gnutls_state.c gnutls_x509.c ext_cert_type.c	\
+	gnutls_rsa_export.c auth_rsa_export.c ext_server_name.c		\
+	auth_dh_common.c gnutls_helper.c gnutls_supplemental.c		\
+	crypto.c random.c pk-libgcrypt.c mpi-libgcrypt.c		\
+	rnd-libgcrypt.c cipher-libgcrypt.c mac-libgcrypt.c
 
 if ENABLE_OPRFI
 COBJECTS += $(OPRFI_COBJECTS)
@@ -95,13 +94,12 @@ HFILES = debug.h gnutls_compress.h defines.h gnutls_cipher.h		\
 	gnutls_buffers.h gnutls_errors.h gnutls_int.h			\
 	gnutls_handshake.h gnutls_num.h gnutls_algorithms.h		\
 	gnutls_dh.h gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h	\
-	gnutls_db.h gnutls_compress_int.h gnutls_auth.h auth_anon.h	\
-	gnutls_extensions.h gnutls_buffer.h x509_b64.h			\
-	gnutls_v2_compat.h gnutls_datum.h auth_cert.h gnutls_mpi.h	\
-	gnutls_pk.h gnutls_record.h gnutls_cert.h gnutls_constate.h	\
-	gnutls_global.h gnutls_sig.h gnutls_mem.h io_debug.h		\
-	ext_max_record.h gnutls_session_pack.h gnutls_str.h		\
-	gnutls_state.h gnutls_x509.h ext_cert_type.h			\
+	gnutls_db.h gnutls_auth.h auth_anon.h gnutls_extensions.h	\
+	gnutls_buffer.h x509_b64.h gnutls_v2_compat.h gnutls_datum.h	\
+	auth_cert.h gnutls_mpi.h gnutls_pk.h gnutls_record.h		\
+	gnutls_cert.h gnutls_constate.h gnutls_global.h gnutls_sig.h	\
+	gnutls_mem.h io_debug.h ext_max_record.h gnutls_session_pack.h	\
+	gnutls_str.h gnutls_state.h gnutls_x509.h ext_cert_type.h	\
 	gnutls_rsa_export.h ext_server_name.h auth_dh_common.h		\
 	ext_srp.h gnutls_srp.h auth_srp.h auth_srp_passwd.h		\
 	gnutls_helper.h auth_psk.h auth_psk_passwd.h			\