Skip to content

Commit 9fc5510

Browse files
committed
Fix a few issues with "make rpm"
1 parent 353a379 commit 9fc5510

3 files changed

Lines changed: 27 additions & 14 deletions

File tree

cmake/include.am

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,3 @@ EXTRA_DIST += cmake/functions.cmake
1010
EXTRA_DIST += cmake/options.h.in
1111
EXTRA_DIST += cmake/modules/FindARIA.cmake
1212
EXTRA_DIST += cmake/modules/FindOQS.cmake
13-
14-
if CMAKE_INSTALL
15-
cmakedir = $(libdir)/cmake/wolfssl
16-
cmake_DATA = cmake/wolfssl-config.cmake \
17-
cmake/wolfssl-config-version.cmake \
18-
cmake/wolfssl-targets.cmake
19-
endif

examples/async/include.am

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

4-
EXTRA_DIST += examples/async/README.md \
5-
examples/async/async_client.c \
6-
examples/async/async_server.c \
7-
examples/async/async_tls.c \
8-
examples/async/async_tls.h \
9-
examples/async/Makefile \
10-
examples/async/user_settings.h
4+
if BUILD_ASYNCCRYPT
5+
6+
noinst_HEADERS += examples/async/async_tls.h
7+
8+
if BUILD_EXAMPLE_CLIENTS
9+
noinst_PROGRAMS += examples/async/async_client
10+
examples_async_async_client_SOURCES = examples/async/async_client.c examples/async/async_tls.c
11+
examples_async_async_client_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD)
12+
examples_async_async_client_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
13+
examples_async_async_client_CFLAGS = $(AM_CFLAGS)
14+
endif
15+
16+
if BUILD_EXAMPLE_SERVERS
17+
noinst_PROGRAMS += examples/async/async_server
18+
examples_async_async_server_SOURCES = examples/async/async_server.c examples/async/async_tls.c
19+
examples_async_async_server_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD)
20+
examples_async_async_server_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
21+
examples_async_async_server_CFLAGS = $(AM_CFLAGS)
22+
endif
23+
endif
24+
25+
dist_example_DATA+= examples/async/async_server.c
26+
dist_example_DATA+= examples/async/async_client.c
27+
DISTCLEANFILES+= examples/async/.libs/async_server
28+
DISTCLEANFILES+= examples/async/.libs/async_client
29+
EXTRA_DIST += examples/async/README.md

rpm/spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ fi
7272
%{_docdir}/wolfssl/example/server.c
7373
%{_docdir}/wolfssl/example/echoclient.c
7474
%{_docdir}/wolfssl/example/echoserver.c
75+
%{_docdir}/wolfssl/example/ocsp_responder.c
7576
%{_docdir}/wolfssl/example/sctp-client.c
7677
%{_docdir}/wolfssl/example/sctp-server.c
7778
%{_docdir}/wolfssl/example/sctp-client-dtls.c

0 commit comments

Comments
 (0)