summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/latex/Makefile.am2
-rw-r--r--extra/gnutls_openssl.c2
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/openpgp/Makefile.am2
-rw-r--r--po/POTFILES.in4
6 files changed, 8 insertions, 8 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 87069cc59b..f1ca3ab642 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -385,7 +385,7 @@ printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
alert_printlist_SOURCES = alert-printlist.c common.c common.h
alert_printlist_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
-error_codes.texi: $(top_srcdir)/lib/gnutls_errors.c $(srcdir)/errcodes.c
+error_codes.texi: $(top_srcdir)/lib/errors.c $(srcdir)/errcodes.c
$(MAKE) $(builddir)/errcodes
$(builddir)/errcodes > $@-tmp
mv -f $@-tmp $@
@@ -395,7 +395,7 @@ algorithms.texi: $(top_srcdir)/lib/algorithms/ciphers.c $(srcdir)/printlist.c
$(builddir)/printlist > $@-tmp
mv -f $@-tmp $@
-alerts.texi: $(top_srcdir)/lib/gnutls_alert.c $(srcdir)/alert-printlist.c
+alerts.texi: $(top_srcdir)/lib/alert.c $(srcdir)/alert-printlist.c
$(MAKE) $(builddir)/alert-printlist
$(builddir)/alert-printlist > $@-tmp
mv -f $@-tmp $@
diff --git a/doc/latex/Makefile.am b/doc/latex/Makefile.am
index 46328d886d..e8c4952626 100644
--- a/doc/latex/Makefile.am
+++ b/doc/latex/Makefile.am
@@ -94,7 +94,7 @@ cha-errors.tex: ../cha-errors.texi
cha-ciphersuites.tex: ../cha-ciphersuites.texi
../scripts/mytexi2latex $< > $@
-error_codes.tex: $(top_srcdir)/lib/gnutls_errors.c
+error_codes.tex: $(top_srcdir)/lib/errors.c
$(MAKE) -C .. errcodes printlist alert-printlist
$(builddir)/../errcodes --latex > $@-tmp
mv -f $@-tmp $@
diff --git a/extra/gnutls_openssl.c b/extra/gnutls_openssl.c
index f28fad855a..4ec0698706 100644
--- a/extra/gnutls_openssl.c
+++ b/extra/gnutls_openssl.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "../lib/gnutls_int.h"
#include "../lib/random.h"
-#include "../lib/gnutls_hash_int.h"
+#include "../lib/hash_int.h"
/* In win32 X509_NAME is defined in wincrypt.h.
* undefine it to avoid the conflict with openssl.h.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e7aaa353c5..9e60733fbc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -106,7 +106,7 @@ HFILES = abstract_int.h debug.h compress.h cipher.h \
constate.h global.h tls-sig.h mem.h \
session_pack.h str.h str_array.h \
state.h x509.h crypto-backend.h \
- srp.h auth/srp.h auth/srp_passwd.h \
+ srp.h auth/srp_kx.h auth/srp_passwd.h \
helper.h supplemental.h crypto.h random.h system.h\
locks.h mbuffers.h ecc.h pin.h fips.h \
priority_options.h
diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 0522cec51a..e357780076 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -37,4 +37,4 @@ noinst_LTLIBRARIES = libgnutls_openpgp.la
COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c \
openpgp.c
-libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h gnutls_openpgp.h
+libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h openpgp.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0c83548039..1703685df8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
# List of source files which contain translatable strings.
-lib/gnutls_alert.c
-lib/gnutls_errors.c
+lib/alert.c
+lib/errors.c
lib/openpgp/output.c
lib/x509/ocsp_output.c
lib/x509/output.c