From ba8c512a77fcdbf070b44f4cc49958778f79a914 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Wed, 6 Jul 2016 13:49:08 -0700
Subject: [PATCH] 1. Some files were missing from make dist. 2. Reorg
 examples/include.am. 3. Stop building example server for now, but keep the
 source.

---
 Makefile.am                |  4 ++--
 certs/include.am           | 16 ++++++++++++++++
 examples/include.am        |  6 ++++++
 examples/server/include.am | 14 ++++++++------
 wolfssh/include.am         |  5 ++++-
 5 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 certs/include.am
 create mode 100644 examples/include.am

diff --git a/Makefile.am b/Makefile.am
index 196f7a54..709065ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,9 +30,9 @@ ACLOCAL_AMFLAGS= -I m4
 
 include src/include.am
 include wolfssh/include.am
-include examples/echoserver/include.am
-include examples/server/include.am
+include examples/include.am
 include test/include.am
+include certs/include.am
 
 
 TEST_EXTENSIONS = .test
diff --git a/certs/include.am b/certs/include.am
new file mode 100644
index 00000000..fcbedd3e
--- /dev/null
+++ b/certs/include.am
@@ -0,0 +1,16 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+
+EXTRA_DIST+= \
+            certs/key-gretel.pem \
+            certs/publickeys.txt \
+            certs/server-key.der \
+            certs/key-ecc.pem \
+            certs/key-hansel.pem \
+            certs/server-cert.der \
+            certs/server-key.pem \
+            certs/key-ecc.pub \
+            certs/passwd.txt \
+            certs/server-cert.pem
diff --git a/examples/include.am b/examples/include.am
new file mode 100644
index 00000000..d1bbde15
--- /dev/null
+++ b/examples/include.am
@@ -0,0 +1,6 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+include examples/echoserver/include.am
+include examples/server/include.am
diff --git a/examples/server/include.am b/examples/server/include.am
index a7a42c34..c59baeef 100644
--- a/examples/server/include.am
+++ b/examples/server/include.am
@@ -1,10 +1,12 @@
 # vim:ft=automake
 # All paths should be given relative to the root
 
-noinst_PROGRAMS += examples/server/server
-examples_server_server_SOURCES      = examples/server/server.c
-examples_server_server_LDADD        = src/libwolfssh.la
-examples_server_server_DEPENDENCIES = src/libwolfssh.la
+#noinst_PROGRAMS += examples/server/server
+#examples_server_server_SOURCES      = examples/server/server.c
+#examples_server_server_LDADD        = src/libwolfssh.la
+#examples_server_server_DEPENDENCIES = src/libwolfssh.la
+#
+#dist_example_DATA+= examples/server/server.c
+#DISTCLEANFILES+= examples/server/.libs/server
 
-dist_example_DATA+= examples/server/server.c
-DISTCLEANFILES+= examples/server/.libs/server
+EXTRA_DIST+= examples/server/server.c
diff --git a/wolfssh/include.am b/wolfssh/include.am
index 17cd8780..e8a8e3ed 100644
--- a/wolfssh/include.am
+++ b/wolfssh/include.am
@@ -5,12 +5,15 @@
 
 nobase_include_HEADERS+= \
                          wolfssh/version.h \
-						 wolfssh/internal.h \
                          wolfssh/ssh.h \
                          wolfssh/port.h \
                          wolfssh/memory.h \
                          wolfssh/settings.h \
                          wolfssh/error.h \
                          wolfssh/visibility.h \
+                         wolfssh/misc.h \
                          wolfssh/log.h
 
+noinst_HEADERS+= \
+                         wolfssh/internal.h
+