summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-07-08 17:21:00 +0200
committerSimon Josefsson <simon@josefsson.org>2008-07-08 17:21:00 +0200
commita1de44c35f616a0979e23a598e92777952224632 (patch)
treee59062c225db73ebf5e78d66f87b307fd6a5c3b8
parent77fa0a0a179454e25adf977f657e462518afc01a (diff)
downloadgnutls-a1de44c35f616a0979e23a598e92777952224632.tar.gz
Generate algorithms.texi the same way as error_codes.texi for consistency.
Fixes 'make distcheck' due to srcdir != objdir breakage.
-rw-r--r--doc/Makefile.am12
-rw-r--r--src/Makefile.am7
2 files changed, 11 insertions, 8 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 90daff0819..ee1bf3a791 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,7 +29,7 @@ endif
info_TEXINFOS = gnutls.texi
gnutls_TEXINFOS = gnutls.texi signatures.texi fdl.texi lgpl-2.1.texi \
- gpl-3.0.texi error_codes.texi gnutls-api.texi \
+ gpl-3.0.texi gnutls-api.texi \
gnutls-extra-api.texi ia-api.texi x509-api.texi pgp-api.texi \
examples/ex-client1.c examples/ex-client2.c \
examples/ex-session-info.c examples/ex-verify.c \
@@ -39,7 +39,10 @@ gnutls_TEXINFOS = gnutls.texi signatures.texi fdl.texi lgpl-2.1.texi \
examples/ex-serv-export.c examples/ex-serv-anon.c \
examples/ex-serv-pgp.c examples/ex-serv-srp.c \
examples/ex-alert.c examples/ex-x509-info.c examples/ex-crq.c \
- examples/ex-pkcs12.c guile.texi $(guile_texi) ../src/algorithms.texi
+ examples/ex-pkcs12.c guile.texi $(guile_texi)
+
+# Generated texinfos.
+gnutls_TEXINFOS += error_codes.texi algorithms.texi
# Images. Make sure there are eps + png + pdf of each, plus the source dia.
gnutls_TEXINFOS += gnutls-internals.dia gnutls-internals.eps \
@@ -120,9 +123,14 @@ pgp-api.texi: ../lib/openpgp/pgp-api.texi
ia-api.texi: ../libextra/ia-api.texi
-$(srcdir)/scripts/sort2.pl < ../libextra/ia-api.texi > ia-api.texi
+# Generated texinfos.
+
error_codes.texi: ../lib/gnutls_errors.c ../src/errcodes.c
-../src/errcodes > error_codes.texi
+algorithms.texi: ../src/algorithms.c
+ -../src/printlist > algorithms.texi
+
guile_texi = core.c.texi extra.c.texi
BUILT_SOURCES = $(guile_texi)
diff --git a/src/Makefile.am b/src/Makefile.am
index a30cd4e4d5..157f413658 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@
# along with this file; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-EXTRA_DIST = README README.srptool algorithms.texi
+EXTRA_DIST = README README.srptool
SUBDIRS = cfg
@@ -97,8 +97,3 @@ tls_test-gaa.c: $(srcdir)/tls_test.gaa
-$(GAA) $< -o tls_test-gaa.c -i tls_test-gaa.h
serv-gaa.c: $(srcdir)/serv.gaa
-$(GAA) $< -o serv-gaa.c -i serv-gaa.h
-
-algorithms.texi: printlist
- @./printlist >algorithms.texi
-
-dist-hook: algorithms.texi