aboutsummaryrefslogtreecommitdiff
path: root/crypto/Makefile.am
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2014-07-10 22:06:10 -0500
committerBrent Cook <bcook@openbsd.org>2015-07-21 12:08:18 -0500
commit5d8a1cf7155130bd8101090d7e1d0c2f90d9b123 (patch)
tree286f7d12e3647f94bd1e6e8e180a4bf6215a0740 /crypto/Makefile.am
parent7a4a37cf596697ae96eeb1c555989e6d1a443187 (diff)
downloadportable-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.am3
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
7lib_LTLIBRARIES = libcrypto.la 7lib_LTLIBRARIES = libcrypto.la
8 8
9EXTRA_DIST = VERSION 9EXTRA_DIST = VERSION
10EXTRA_DIST += CMakeLists.txt
10 11
11libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined 12libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined
12libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la 13libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la
@@ -236,7 +237,9 @@ libcrypto_la_SOURCES += bio/bss_conn.c
236libcrypto_la_SOURCES += bio/bss_dgram.c 237libcrypto_la_SOURCES += bio/bss_dgram.c
237libcrypto_la_SOURCES += bio/bss_fd.c 238libcrypto_la_SOURCES += bio/bss_fd.c
238libcrypto_la_SOURCES += bio/bss_file.c 239libcrypto_la_SOURCES += bio/bss_file.c
240if !HOST_WIN
239libcrypto_la_SOURCES += bio/bss_log.c 241libcrypto_la_SOURCES += bio/bss_log.c
242endif
240libcrypto_la_SOURCES += bio/bss_mem.c 243libcrypto_la_SOURCES += bio/bss_mem.c
241libcrypto_la_SOURCES += bio/bss_null.c 244libcrypto_la_SOURCES += bio/bss_null.c
242libcrypto_la_SOURCES += bio/bss_sock.c 245libcrypto_la_SOURCES += bio/bss_sock.c