diff options
author | Brent Cook <busterb@gmail.com> | 2014-07-10 22:06:10 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-07-21 12:08:18 -0500 |
commit | 5d8a1cf7155130bd8101090d7e1d0c2f90d9b123 (patch) | |
tree | 286f7d12e3647f94bd1e6e8e180a4bf6215a0740 /crypto/Makefile.am | |
parent | 7a4a37cf596697ae96eeb1c555989e6d1a443187 (diff) | |
download | portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.gz portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.bz2 portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.zip |
add initial CMake and Visual Studio build support
This moves the compatibility include files from include to
include/compat so we can use the awful MS C compiler
<../include/> trick to emulate the GNU #include_next extension.
This also removes a few old compat files we do not need anymore.
Diffstat (limited to 'crypto/Makefile.am')
-rw-r--r-- | crypto/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 1799969..b988d77 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
@@ -7,6 +7,7 @@ AM_CFLAGS += -I$(top_srcdir)/crypto/modes | |||
7 | lib_LTLIBRARIES = libcrypto.la | 7 | lib_LTLIBRARIES = libcrypto.la |
8 | 8 | ||
9 | EXTRA_DIST = VERSION | 9 | EXTRA_DIST = VERSION |
10 | EXTRA_DIST += CMakeLists.txt | ||
10 | 11 | ||
11 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined | 12 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined |
12 | libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la | 13 | libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la |
@@ -236,7 +237,9 @@ libcrypto_la_SOURCES += bio/bss_conn.c | |||
236 | libcrypto_la_SOURCES += bio/bss_dgram.c | 237 | libcrypto_la_SOURCES += bio/bss_dgram.c |
237 | libcrypto_la_SOURCES += bio/bss_fd.c | 238 | libcrypto_la_SOURCES += bio/bss_fd.c |
238 | libcrypto_la_SOURCES += bio/bss_file.c | 239 | libcrypto_la_SOURCES += bio/bss_file.c |
240 | if !HOST_WIN | ||
239 | libcrypto_la_SOURCES += bio/bss_log.c | 241 | libcrypto_la_SOURCES += bio/bss_log.c |
242 | endif | ||
240 | libcrypto_la_SOURCES += bio/bss_mem.c | 243 | libcrypto_la_SOURCES += bio/bss_mem.c |
241 | libcrypto_la_SOURCES += bio/bss_null.c | 244 | libcrypto_la_SOURCES += bio/bss_null.c |
242 | libcrypto_la_SOURCES += bio/bss_sock.c | 245 | libcrypto_la_SOURCES += bio/bss_sock.c |