From 976f64d932bc5fac8d18dd95feddcfb4f3782551 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Sat, 6 Dec 2014 18:59:25 -0600
Subject: read all library versions directly from files

This makes building and testing easier because the library Makefile.am
files are use directly rather than as templates. Thanks to Wouter Clarie
for the idea.
---
 ssl/Makefile.am     | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ssl/Makefile.am.tpl | 51 ---------------------------------------------------
 2 files changed, 52 insertions(+), 51 deletions(-)
 create mode 100644 ssl/Makefile.am
 delete mode 100644 ssl/Makefile.am.tpl

(limited to 'ssl')

diff --git a/ssl/Makefile.am b/ssl/Makefile.am
new file mode 100644
index 0000000..52a29b8
--- /dev/null
+++ b/ssl/Makefile.am
@@ -0,0 +1,52 @@
+include $(top_srcdir)/Makefile.am.common
+
+lib_LTLIBRARIES = libssl.la
+
+EXTRA_DIST = VERSION
+
+libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@
+libssl_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
+
+libssl_la_SOURCES = bio_ssl.c
+libssl_la_SOURCES += d1_both.c
+libssl_la_SOURCES += d1_clnt.c
+libssl_la_SOURCES += d1_enc.c
+libssl_la_SOURCES += d1_lib.c
+libssl_la_SOURCES += d1_meth.c
+libssl_la_SOURCES += d1_pkt.c
+libssl_la_SOURCES += d1_srtp.c
+libssl_la_SOURCES += d1_srvr.c
+libssl_la_SOURCES += pqueue.c
+libssl_la_SOURCES += s23_clnt.c
+libssl_la_SOURCES += s23_lib.c
+libssl_la_SOURCES += s23_meth.c
+libssl_la_SOURCES += s23_pkt.c
+libssl_la_SOURCES += s23_srvr.c
+libssl_la_SOURCES += s3_both.c
+libssl_la_SOURCES += s3_cbc.c
+libssl_la_SOURCES += s3_clnt.c
+libssl_la_SOURCES += s3_enc.c
+libssl_la_SOURCES += s3_lib.c
+libssl_la_SOURCES += s3_meth.c
+libssl_la_SOURCES += s3_pkt.c
+libssl_la_SOURCES += s3_srvr.c
+libssl_la_SOURCES += ssl_algs.c
+libssl_la_SOURCES += ssl_asn1.c
+libssl_la_SOURCES += ssl_cert.c
+libssl_la_SOURCES += ssl_ciph.c
+libssl_la_SOURCES += ssl_err.c
+libssl_la_SOURCES += ssl_err2.c
+libssl_la_SOURCES += ssl_lib.c
+libssl_la_SOURCES += ssl_rsa.c
+libssl_la_SOURCES += ssl_sess.c
+libssl_la_SOURCES += ssl_stat.c
+libssl_la_SOURCES += ssl_txt.c
+libssl_la_SOURCES += t1_clnt.c
+libssl_la_SOURCES += t1_enc.c
+libssl_la_SOURCES += t1_lib.c
+libssl_la_SOURCES += t1_meth.c
+libssl_la_SOURCES += t1_reneg.c
+libssl_la_SOURCES += t1_srvr.c
+
+noinst_HEADERS = srtp.h
+noinst_HEADERS += ssl_locl.h
diff --git a/ssl/Makefile.am.tpl b/ssl/Makefile.am.tpl
deleted file mode 100644
index c8f72d1..0000000
--- a/ssl/Makefile.am.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-include $(top_srcdir)/Makefile.am.common
-
-lib_LTLIBRARIES = libssl.la
-
-libssl_la_LDFLAGS = -version-info libssl-version
-
-libssl_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
-
-libssl_la_SOURCES = bio_ssl.c
-libssl_la_SOURCES += d1_both.c
-libssl_la_SOURCES += d1_clnt.c
-libssl_la_SOURCES += d1_enc.c
-libssl_la_SOURCES += d1_lib.c
-libssl_la_SOURCES += d1_meth.c
-libssl_la_SOURCES += d1_pkt.c
-libssl_la_SOURCES += d1_srtp.c
-libssl_la_SOURCES += d1_srvr.c
-libssl_la_SOURCES += pqueue.c
-libssl_la_SOURCES += s23_clnt.c
-libssl_la_SOURCES += s23_lib.c
-libssl_la_SOURCES += s23_meth.c
-libssl_la_SOURCES += s23_pkt.c
-libssl_la_SOURCES += s23_srvr.c
-libssl_la_SOURCES += s3_both.c
-libssl_la_SOURCES += s3_cbc.c
-libssl_la_SOURCES += s3_clnt.c
-libssl_la_SOURCES += s3_enc.c
-libssl_la_SOURCES += s3_lib.c
-libssl_la_SOURCES += s3_meth.c
-libssl_la_SOURCES += s3_pkt.c
-libssl_la_SOURCES += s3_srvr.c
-libssl_la_SOURCES += ssl_algs.c
-libssl_la_SOURCES += ssl_asn1.c
-libssl_la_SOURCES += ssl_cert.c
-libssl_la_SOURCES += ssl_ciph.c
-libssl_la_SOURCES += ssl_err.c
-libssl_la_SOURCES += ssl_err2.c
-libssl_la_SOURCES += ssl_lib.c
-libssl_la_SOURCES += ssl_rsa.c
-libssl_la_SOURCES += ssl_sess.c
-libssl_la_SOURCES += ssl_stat.c
-libssl_la_SOURCES += ssl_txt.c
-libssl_la_SOURCES += t1_clnt.c
-libssl_la_SOURCES += t1_enc.c
-libssl_la_SOURCES += t1_lib.c
-libssl_la_SOURCES += t1_meth.c
-libssl_la_SOURCES += t1_reneg.c
-libssl_la_SOURCES += t1_srvr.c
-
-noinst_HEADERS = srtp.h
-noinst_HEADERS += ssl_locl.h
-- 
cgit v1.2.3-55-g6feb