You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2016/10/26 17:23:15 UTC
[trafficserver] 01/02: TS-5000: Move sslheaders into the
non-recursive plugins build.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit eb3aa29fb9d0c27ca5c36bec196c167f9cca862c
Author: James Peach <jp...@apache.org>
AuthorDate: Wed Oct 26 09:43:39 2016 -0700
TS-5000: Move sslheaders into the non-recursive plugins build.
---
configure.ac | 1 -
plugins/Makefile.am | 4 ++
plugins/experimental/Makefile.am | 3 +-
plugins/experimental/sslheaders/Makefile.am | 45 ---------------------
plugins/experimental/sslheaders/Makefile.inc | 59 ++++++++++++++++++++++++++++
5 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/configure.ac b/configure.ac
index 369818c..e60854d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1880,7 +1880,6 @@ AC_CONFIG_FILES([
plugins/Makefile
plugins/experimental/Makefile
plugins/experimental/mysql_remap/Makefile
- plugins/experimental/sslheaders/Makefile
proxy/Makefile
proxy/api/ts/Makefile
proxy/config/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 38c3147..0fe336b 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -44,6 +44,7 @@ include tcpinfo/Makefile.inc
include xdebug/Makefile.inc
if BUILD_EXPERIMENTAL_PLUGINS
+
include experimental/acme/Makefile.inc
include experimental/balancer/Makefile.inc
include experimental/buffer_upload/Makefile.inc
@@ -67,6 +68,7 @@ include experimental/mp4/Makefile.inc
include experimental/multiplexer/Makefile.inc
include experimental/remap_purge/Makefile.inc
include experimental/ssl_cert_loader/Makefile.inc
+include experimental/sslheaders/Makefile.inc
include experimental/stale_while_revalidate/Makefile.inc
include experimental/stream_editor/Makefile.inc
include experimental/ts_lua/Makefile.inc
@@ -91,6 +93,8 @@ endif
SUBDIRS += experimental
endif
+TESTS_ENVIRONMENT = LSAN_OPTIONS=suppressions=suppression.txt
+
TESTS = $(check_PROGRAMS)
tidy-local: $(DIST_SOURCES)
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index f81af00..fb53a83 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -14,8 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = \
- sslheaders
+SUBDIRS =
if HAS_MYSQL
SUBDIRS += mysql_remap
diff --git a/plugins/experimental/sslheaders/Makefile.am b/plugins/experimental/sslheaders/Makefile.am
deleted file mode 100644
index 7fa88ee..0000000
--- a/plugins/experimental/sslheaders/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(top_srcdir)/build/plugins.mk
-
-AM_CPPFLAGS += @OPENSSL_INCLUDES@ -I$(top_srcdir)/lib
-
-noinst_LTLIBRARIES = libsslhdr.la
-pkglib_LTLIBRARIES = sslheaders.la
-check_PROGRAMS = test_sslheaders
-
-libsslhdr_la_SOURCES = sslheaders.h expand.cc util.cc
-
-sslheaders_la_SOURCES = sslheaders.cc sslheaders.h
-sslheaders_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-sslheaders_la_LIBADD = libsslhdr.la
-
-test_sslheaders_SOURCES = test_sslheaders.cc sslheaders.h
-test_sslheaders_LDFLAGS = @OPENSSL_LDFLAGS@
-test_sslheaders_LDADD = \
- @LIBTOOL_LINK_FLAGS@ \
- libsslhdr.la \
- $(top_builddir)/lib/ts/libtsutil.la \
- @OPENSSL_LIBS@
-
-TESTS_ENVIRONMENT = LSAN_OPTIONS=suppressions=suppression.txt
-TESTS = $(check_PROGRAMS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/sslheaders/Makefile.inc b/plugins/experimental/sslheaders/Makefile.inc
new file mode 100644
index 0000000..1b5ea5a
--- /dev/null
+++ b/plugins/experimental/sslheaders/Makefile.inc
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sslheaders_CPP_FLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@ \
+ -I$(top_srcdir)/lib
+
+noinst_LTLIBRARIES += experimental/sslheaders/libsslhdr.la
+pkglib_LTLIBRARIES += experimental/sslheaders/sslheaders.la
+check_PROGRAMS += experimental/sslheaders/test_sslheaders
+
+experimental_sslheaders_libsslhdr_la_SOURCES = \
+ experimental/sslheaders/sslheaders.h \
+ experimental/sslheaders/expand.cc \
+ experimental/sslheaders/util.cc
+experimental_sslheaders_libsslhdr_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@
+
+experimental_sslheaders_sslheaders_la_SOURCES = \
+ experimental/sslheaders/sslheaders.cc \
+ experimental/sslheaders/sslheaders.h
+experimental_sslheaders_sslheaders_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@
+experimental_sslheaders_sslheaders_la_LDFLAGS = \
+ $(TS_PLUGIN_LD_FLAGS)
+experimental_sslheaders_sslheaders_la_LIBADD = \
+ experimental/sslheaders/libsslhdr.la
+
+experimental_sslheaders_test_sslheaders_SOURCES = \
+ experimental/sslheaders/test_sslheaders.cc \
+ experimental/sslheaders/sslheaders.h
+experimental_sslheaders_test_sslheaders_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@ \
+ -I$(top_srcdir)/lib
+experimental_sslheaders_test_sslheaders_LDFLAGS = @OPENSSL_LDFLAGS@
+experimental_sslheaders_test_sslheaders_LDADD = \
+ @LIBTOOL_LINK_FLAGS@ \
+ experimental/sslheaders/libsslhdr.la \
+ $(top_builddir)/lib/ts/libtsutil.la \
+ @OPENSSL_LIBS@
+
+# vim: ft=make ts=8 sw=8 et:
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.