From 976f64d932bc5fac8d18dd95feddcfb4f3782551 Mon Sep 17 00:00:00 2001 From: Brent Cook 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. --- tls/Makefile.am | 18 ++++++++++++++++++ tls/Makefile.am.tpl | 17 ----------------- 2 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 tls/Makefile.am delete mode 100644 tls/Makefile.am.tpl (limited to 'tls') diff --git a/tls/Makefile.am b/tls/Makefile.am new file mode 100644 index 0000000..7f65ea5 --- /dev/null +++ b/tls/Makefile.am @@ -0,0 +1,18 @@ +include $(top_srcdir)/Makefile.am.common + +if ENABLE_LIBTLS +lib_LTLIBRARIES = libtls.la + +EXTRA_DIST = VERSION + +libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ +libtls_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) + +libtls_la_SOURCES = tls.c +libtls_la_SOURCES += tls_client.c +libtls_la_SOURCES += tls_config.c +libtls_la_SOURCES += tls_server.c +libtls_la_SOURCES += tls_util.c +libtls_la_SOURCES += tls_verify.c +noinst_HEADERS = tls_internal.h +endif diff --git a/tls/Makefile.am.tpl b/tls/Makefile.am.tpl deleted file mode 100644 index 55461c6..0000000 --- a/tls/Makefile.am.tpl +++ /dev/null @@ -1,17 +0,0 @@ -include $(top_srcdir)/Makefile.am.common - -if ENABLE_LIBTLS -lib_LTLIBRARIES = libtls.la - -libtls_la_LDFLAGS = -version-info libtls-version - -libtls_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS) - -libtls_la_SOURCES = tls.c -libtls_la_SOURCES += tls_client.c -libtls_la_SOURCES += tls_config.c -libtls_la_SOURCES += tls_server.c -libtls_la_SOURCES += tls_util.c -libtls_la_SOURCES += tls_verify.c -noinst_HEADERS = tls_internal.h -endif -- cgit v1.2.3-55-g6feb