Skip to content

Commit 995cf11

Browse files
authored
Merge pull request wolfSSL#8 from ejohnstown/include-fix
Update the automake include files to add missing items
2 parents 8b4bae6 + ba8c512 commit 995cf11

5 files changed

Lines changed: 36 additions & 9 deletions

File tree

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ ACLOCAL_AMFLAGS= -I m4
3030

3131
include src/include.am
3232
include wolfssh/include.am
33-
include examples/echoserver/include.am
34-
include examples/server/include.am
33+
include examples/include.am
3534
include test/include.am
35+
include certs/include.am
3636

3737

3838
TEST_EXTENSIONS = .test

‎certs/include.am‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# vim:ft=automake
2+
# included from Top Level Makefile.am
3+
# All paths should be given relative to the root
4+
5+
6+
EXTRA_DIST+= \
7+
certs/key-gretel.pem \
8+
certs/publickeys.txt \
9+
certs/server-key.der \
10+
certs/key-ecc.pem \
11+
certs/key-hansel.pem \
12+
certs/server-cert.der \
13+
certs/server-key.pem \
14+
certs/key-ecc.pub \
15+
certs/passwd.txt \
16+
certs/server-cert.pem

‎examples/include.am‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# vim:ft=automake
2+
# included from Top Level Makefile.am
3+
# All paths should be given relative to the root
4+
5+
include examples/echoserver/include.am
6+
include examples/server/include.am

‎examples/server/include.am‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# vim:ft=automake
22
# All paths should be given relative to the root
33

4-
noinst_PROGRAMS += examples/server/server
5-
examples_server_server_SOURCES = examples/server/server.c
6-
examples_server_server_LDADD = src/libwolfssh.la
7-
examples_server_server_DEPENDENCIES = src/libwolfssh.la
4+
#noinst_PROGRAMS += examples/server/server
5+
#examples_server_server_SOURCES = examples/server/server.c
6+
#examples_server_server_LDADD = src/libwolfssh.la
7+
#examples_server_server_DEPENDENCIES = src/libwolfssh.la
8+
#
9+
#dist_example_DATA+= examples/server/server.c
10+
#DISTCLEANFILES+= examples/server/.libs/server
811

9-
dist_example_DATA+= examples/server/server.c
10-
DISTCLEANFILES+= examples/server/.libs/server
12+
EXTRA_DIST+= examples/server/server.c

‎wolfssh/include.am‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55

66
nobase_include_HEADERS+= \
77
wolfssh/version.h \
8-
wolfssh/internal.h \
98
wolfssh/ssh.h \
109
wolfssh/port.h \
1110
wolfssh/memory.h \
1211
wolfssh/settings.h \
1312
wolfssh/error.h \
1413
wolfssh/visibility.h \
14+
wolfssh/misc.h \
1515
wolfssh/log.h
1616

17+
noinst_HEADERS+= \
18+
wolfssh/internal.h
19+

0 commit comments

Comments
 (0)