diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2016-04-07 15:08:12 +0900 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2016-04-09 12:06:40 -0500 |
commit | 2510a5e6f98360bb7cd4a52ecf2274656fe75dcc (patch) | |
tree | 4ae888795d7c741f0c01eed81c8581d33b39cd07 /apps/openssl | |
parent | 9a98de6c34d9fbb97f2619617c102691d6065a81 (diff) | |
download | portable-2510a5e6f98360bb7cd4a52ecf2274656fe75dcc.tar.gz portable-2510a5e6f98360bb7cd4a52ecf2274656fe75dcc.tar.bz2 portable-2510a5e6f98360bb7cd4a52ecf2274656fe75dcc.zip |
modify cmake to build nc
- modify structure of CMakeLists.txt under apps/
* move apps/CMakeLists.txt to apps/openssl/ since this is for openssl build
* create new apps/nc/CMakeLists.txt for nc build
* modify apps/CMakeLists.txt just add_subdirectory()
- add checking and compile of arc4random_uniform()
- add installing man files, openssl.1 and nc.1
Diffstat (limited to 'apps/openssl')
-rw-r--r-- | apps/openssl/CMakeLists.txt | 81 | ||||
-rw-r--r-- | apps/openssl/Makefile.am | 1 |
2 files changed, 82 insertions, 0 deletions
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt new file mode 100644 index 0000000..d4f786b --- /dev/null +++ b/apps/openssl/CMakeLists.txt | |||
@@ -0,0 +1,81 @@ | |||
1 | include_directories( | ||
2 | . | ||
3 | ../../include | ||
4 | ../../include/compat | ||
5 | ) | ||
6 | |||
7 | set( | ||
8 | OPENSSL_SRC | ||
9 | apps.c | ||
10 | asn1pars.c | ||
11 | ca.c | ||
12 | ciphers.c | ||
13 | cms.c | ||
14 | crl.c | ||
15 | crl2p7.c | ||
16 | dgst.c | ||
17 | dh.c | ||
18 | dhparam.c | ||
19 | dsa.c | ||
20 | dsaparam.c | ||
21 | ec.c | ||
22 | ecparam.c | ||
23 | enc.c | ||
24 | errstr.c | ||
25 | gendh.c | ||
26 | gendsa.c | ||
27 | genpkey.c | ||
28 | genrsa.c | ||
29 | nseq.c | ||
30 | ocsp.c | ||
31 | openssl.c | ||
32 | passwd.c | ||
33 | pkcs12.c | ||
34 | pkcs7.c | ||
35 | pkcs8.c | ||
36 | pkey.c | ||
37 | pkeyparam.c | ||
38 | pkeyutl.c | ||
39 | prime.c | ||
40 | rand.c | ||
41 | req.c | ||
42 | rsa.c | ||
43 | rsautl.c | ||
44 | s_cb.c | ||
45 | s_client.c | ||
46 | s_server.c | ||
47 | s_socket.c | ||
48 | s_time.c | ||
49 | sess_id.c | ||
50 | smime.c | ||
51 | speed.c | ||
52 | spkac.c | ||
53 | ts.c | ||
54 | verify.c | ||
55 | version.c | ||
56 | x509.c | ||
57 | ) | ||
58 | |||
59 | if(CMAKE_HOST_UNIX) | ||
60 | set(OPENSSL_SRC ${OPENSSL_SRC} apps_posix.c) | ||
61 | set(OPENSSL_SRC ${OPENSSL_SRC} certhash.c) | ||
62 | endif() | ||
63 | |||
64 | if(CMAKE_HOST_WIN32) | ||
65 | set(OPENSSL_SRC ${OPENSSL_SRC} apps_win.c) | ||
66 | set(OPENSSL_SRC ${OPENSSL_SRC} certhash_win.c) | ||
67 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c) | ||
68 | endif() | ||
69 | |||
70 | check_function_exists(strtonum HAVE_STRTONUM) | ||
71 | if(HAVE_STRTONUM) | ||
72 | add_definitions(-DHAVE_STRTONUM) | ||
73 | else() | ||
74 | set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c) | ||
75 | endif() | ||
76 | |||
77 | add_executable(openssl ${OPENSSL_SRC}) | ||
78 | target_link_libraries(openssl ${OPENSSL_LIBS}) | ||
79 | |||
80 | install(TARGETS openssl DESTINATION bin) | ||
81 | install(FILES openssl.1 DESTINATION share/man/man1) | ||
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am index 6ec3d62..7345479 100644 --- a/apps/openssl/Makefile.am +++ b/apps/openssl/Makefile.am | |||
@@ -89,6 +89,7 @@ noinst_HEADERS += timeouts.h | |||
89 | EXTRA_DIST = cert.pem | 89 | EXTRA_DIST = cert.pem |
90 | EXTRA_DIST += openssl.cnf | 90 | EXTRA_DIST += openssl.cnf |
91 | EXTRA_DIST += x509v3.cnf | 91 | EXTRA_DIST += x509v3.cnf |
92 | EXTRA_DIST += CMakeLists.txt | ||
92 | 93 | ||
93 | install-exec-hook: | 94 | install-exec-hook: |
94 | @if [ "@OPENSSLDIR@x" != "x" ]; then \ | 95 | @if [ "@OPENSSLDIR@x" != "x" ]; then \ |