example programs are now located in doc/examples directory.

6 files changed, 14 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index 7fbbb75b23..d20de755c0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Version 0.?.?
 - Added "gnutls/compat.h" header which must be included if the obsolete 
   0.4.x API is to be used.
+- Example programs are now stored in doc/examples/
 
 Version 0.5.11 (5/11/2002)
 - Some fixes in 'gnutls-cli' client program to prevent some segmentation 
diff --git a/configure.in b/configure.in
index 2ceb3f675c..c1324c9720 100644
--- a/configure.in
+++ b/configure.in
@@ -393,6 +393,7 @@ AC_CONFIG_FILES([Makefile src/Makefile libextra/Makefile lib/Makefile \
 lib/libgnutls-config libextra/libgnutls-extra-config \
 doc/Makefile src/x509/Makefile src/srp/Makefile src/openpgp/Makefile \
 doc/tex/Makefile doc/tex/cover.tex doc/scripts/Makefile \
+doc/examples/Makefile \
 includes/Makefile includes/gnutls/Makefile])
 
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 29e9e9cf62..0512a95109 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST = TODO README.CVS README.autoconf
-SUBDIRS = tex scripts
+SUBDIRS = tex scripts examples
 
diff --git a/doc/examples/.cvsignore b/doc/examples/.cvsignore
new file mode 100644
index 0000000000..786b61a3c1
--- /dev/null
+++ b/doc/examples/.cvsignore
@@ -0,0 +1,2 @@
+*.c
+Makefile.in
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
new file mode 100644
index 0000000000..4d94a8fa2c
--- /dev/null
+++ b/doc/examples/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = alert.c client-srp.c serv-export.c \
+	client1.c client2.c info.c rfc2818.c \
+	serv1.c client-resume.c serv-srp.c \
+	serv-pgp.c
+
diff --git a/doc/tex/Makefile.am b/doc/tex/Makefile.am
index 66a84feaa5..a8f5304856 100644
--- a/doc/tex/Makefile.am
+++ b/doc/tex/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = gnutls.tex gnutls.ps \
 	fdl.tex cover.tex.in gnutls-logo.ps layers.eps pgp-fig1.eps \
-	x509-1.eps internals.eps
+	x509-1.eps internals.eps examples
 
 EXAMPLE_OBJECTS = ex-alert.tex ex-client-srp.tex ex-serv-export.tex \
 	ex-client1.tex ex-client2.tex ex-info.tex ex-rfc2818.tex \
@@ -43,11 +43,10 @@ clean:
 
 examples: $(EXAMPLE_OBJECTS)
 	@echo "Generating example programs... "
-	@echo "They will be placed in examples/ directory."
+	@echo "They will be placed in doc/examples/ directory."
 	@echo ""
-	@-mkdir examples/ && \
-	for i in $(EXAMPLE_OBJECTS); do \
+	@for i in $(EXAMPLE_OBJECTS); do \
 		out=`echo -n $$i|sed s/\.tex//`; \
-		cat $$i|grep -v "^\\\\" > examples/$$out.c; \
+		cat $$i|grep -v "^\\\\" > ../examples/$$out.c; \
 		done