You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/10/25 02:03:16 UTC
[trafficserver] branch master updated: TS-4998: Move plugins into a
common non-recursive build.
This is an automated email from the ASF dual-hosted git repository.
jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 7046476 TS-4998: Move plugins into a common non-recursive build.
7046476 is described below
commit 70464768bbb1e113f278801b2adaf79f25990b9a
Author: James Peach <jp...@apache.org>
AuthorDate: Mon Oct 24 13:13:18 2016 -0700
TS-4998: Move plugins into a common non-recursive build.
---
configure.ac | 15 ---
plugins/Makefile.am | 48 ++++---
plugins/authproxy/Makefile.am | 27 ----
.../Makefile.am => authproxy/Makefile.inc} | 16 +--
plugins/background_fetch/Makefile.am | 26 ----
.../Makefile.am => background_fetch/Makefile.inc} | 19 ++-
.../Makefile.am => conf_remap/Makefile.inc} | 12 +-
plugins/esi/Makefile.am | 106 ---------------
plugins/esi/Makefile.inc | 143 +++++++++++++++++++++
plugins/generator/Makefile.am | 27 ----
.../{xdebug/Makefile.am => generator/Makefile.inc} | 13 +-
plugins/gzip/Makefile.am | 26 ----
plugins/{xdebug/Makefile.am => gzip/Makefile.inc} | 13 +-
plugins/header_rewrite/Makefile.am | 47 -------
plugins/header_rewrite/Makefile.inc | 60 +++++++++
plugins/healthchecks/Makefile.am | 30 -----
.../Makefile.am => healthchecks/Makefile.inc} | 13 +-
.../Makefile.am => libloader/Makefile.inc} | 13 +-
plugins/regex_remap/Makefile.am | 26 ----
.../Makefile.am => regex_remap/Makefile.inc} | 13 +-
plugins/regex_revalidate/Makefile.am | 26 ----
.../Makefile.am => regex_revalidate/Makefile.inc} | 13 +-
.../{xdebug/Makefile.am => s3_auth/Makefile.inc} | 13 +-
plugins/stats_over_http/Makefile.am | 26 ----
.../Makefile.am => stats_over_http/Makefile.inc} | 13 +-
.../{xdebug/Makefile.am => tcpinfo/Makefile.inc} | 13 +-
plugins/xdebug/{Makefile.am => Makefile.inc} | 13 +-
27 files changed, 275 insertions(+), 535 deletions(-)
diff --git a/configure.ac b/configure.ac
index adbfb2e..890d4a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1879,21 +1879,6 @@ AC_CONFIG_FILES([
mgmt/cluster/Makefile
mgmt/utils/Makefile
plugins/Makefile
- plugins/authproxy/Makefile
- plugins/background_fetch/Makefile
- plugins/conf_remap/Makefile
- plugins/esi/Makefile
- plugins/generator/Makefile
- plugins/gzip/Makefile
- plugins/header_rewrite/Makefile
- plugins/healthchecks/Makefile
- plugins/libloader/Makefile
- plugins/regex_remap/Makefile
- plugins/regex_revalidate/Makefile
- plugins/s3_auth/Makefile
- plugins/stats_over_http/Makefile
- plugins/tcpinfo/Makefile
- plugins/xdebug/Makefile
plugins/experimental/Makefile
plugins/experimental/acme/Makefile
plugins/experimental/balancer/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 0eb7980..1ac1b8f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -16,23 +16,39 @@
# Add new plugins in alphabetic order, but keep experimental always at the bottom.
-SUBDIRS = \
- authproxy \
- background_fetch \
- conf_remap \
- esi \
- generator \
- gzip \
- header_rewrite \
- healthchecks \
- libloader \
- regex_remap \
- regex_revalidate \
- s3_auth \
- stats_over_http \
- tcpinfo \
- xdebug
+include $(top_srcdir)/build/plugins.mk
+include $(top_srcdir)/build/tidy.mk
+
+check_PROGRAMS =
+noinst_LTLIBRARIES =
+pkglib_LTLIBRARIES =
+
+SUBDIRS =
+
+AM_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
if BUILD_EXPERIMENTAL_PLUGINS
SUBDIRS += experimental
endif
+
+include authproxy/Makefile.inc
+include background_fetch/Makefile.inc
+include conf_remap/Makefile.inc
+include esi/Makefile.inc
+include generator/Makefile.inc
+include gzip/Makefile.inc
+include header_rewrite/Makefile.inc
+include healthchecks/Makefile.inc
+include libloader/Makefile.inc
+include regex_remap/Makefile.inc
+include regex_revalidate/Makefile.inc
+include s3_auth/Makefile.inc
+include stats_over_http/Makefile.inc
+include tcpinfo/Makefile.inc
+include xdebug/Makefile.inc
+
+TESTS = $(check_PROGRAMS)
+
+tidy-local: $(DIST_SOURCES)
+ $(CXX_Clang_Tidy)
+ $(CC_Clang_Tidy)
diff --git a/plugins/authproxy/Makefile.am b/plugins/authproxy/Makefile.am
deleted file mode 100644
index e6c182f..0000000
--- a/plugins/authproxy/Makefile.am
+++ /dev/null
@@ -1,27 +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
-
-pkglib_LTLIBRARIES = authproxy.la
-authproxy_la_SOURCES = authproxy.cc utils.cc utils.h
-authproxy_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/tcpinfo/Makefile.am b/plugins/authproxy/Makefile.inc
similarity index 77%
rename from plugins/tcpinfo/Makefile.am
rename to plugins/authproxy/Makefile.inc
index 9865ad5..a46a242 100644
--- a/plugins/tcpinfo/Makefile.am
+++ b/plugins/authproxy/Makefile.inc
@@ -14,14 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = tcpinfo.la
-tcpinfo_la_SOURCES = tcpinfo.cc
-tcpinfo_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += authproxy/authproxy.la
+authproxy_authproxy_la_SOURCES = \
+ authproxy/authproxy.cc \
+ authproxy/utils.cc \
+ authproxy/utils.h
diff --git a/plugins/background_fetch/Makefile.am b/plugins/background_fetch/Makefile.am
deleted file mode 100644
index 1f2ed5b..0000000
--- a/plugins/background_fetch/Makefile.am
+++ /dev/null
@@ -1,26 +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
-
-pkglib_LTLIBRARIES = background_fetch.la
-background_fetch_la_SOURCES = background_fetch.cc headers.cc rules.cc configs.cc
-background_fetch_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/conf_remap/Makefile.am b/plugins/background_fetch/Makefile.inc
similarity index 71%
rename from plugins/conf_remap/Makefile.am
rename to plugins/background_fetch/Makefile.inc
index 3495e40..23e0962 100644
--- a/plugins/conf_remap/Makefile.am
+++ b/plugins/background_fetch/Makefile.inc
@@ -14,13 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = conf_remap.la
-conf_remap_la_SOURCES = conf_remap.cc
-conf_remap_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += background_fetch/background_fetch.la
+background_fetch_background_fetch_la_SOURCES = \
+ background_fetch/background_fetch.cc
+ background_fetch/configs.cc
+ background_fetch/configs.h
+ background_fetch/headers.cc
+ background_fetch/headers.h
+ background_fetch/rules.cc
+ background_fetch/rules.h
diff --git a/plugins/libloader/Makefile.am b/plugins/conf_remap/Makefile.inc
similarity index 77%
rename from plugins/libloader/Makefile.am
rename to plugins/conf_remap/Makefile.inc
index ea92fe6..155b94d 100644
--- a/plugins/libloader/Makefile.am
+++ b/plugins/conf_remap/Makefile.inc
@@ -14,13 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = libloader.la
-libloader_la_SOURCES = libloader.c
-libloader_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+pkglib_LTLIBRARIES += conf_remap/conf_remap.la
+conf_remap_conf_remap_la_SOURCES = conf_remap/conf_remap.cc
diff --git a/plugins/esi/Makefile.am b/plugins/esi/Makefile.am
deleted file mode 100644
index 3e21961..0000000
--- a/plugins/esi/Makefile.am
+++ /dev/null
@@ -1,106 +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 += \
- -I$(srcdir)/lib \
- -I$(srcdir)/fetcher \
- -I$(srcdir)/test
-
-AM_CXXFLAGS = \
- -Wno-deprecated
-
-noinst_LTLIBRARIES = libesicore.la libtest.la
-pkglib_LTLIBRARIES = esi.la combo_handler.la
-
-check_PROGRAMS = docnode_test parser_test processor_test utils_test vars_test gzip_test
-
-libesicore_la_SOURCES = \
- lib/DocNode.cc \
- lib/EsiParser.cc \
- lib/EsiGzip.cc \
- lib/EsiGunzip.cc \
- lib/EsiProcessor.cc \
- lib/Expression.cc \
- lib/FailureInfo.cc \
- lib/HandlerManager.cc \
- lib/Stats.cc \
- lib/Utils.cc \
- lib/Variables.cc \
- lib/gzip.cc
-
-# NOTE: HandlerManager::getHandler() is implemented differently in
-# HandlerManager.cc and TestHandlerManager.cc. The unit tests depend
-# on the TestHandlerManager.cc implementation, so don't accidentally
-# link the wrong one into libtest.
-
-libtest_la_SOURCES = \
- lib/DocNode.cc \
- lib/EsiParser.cc \
- lib/EsiGzip.cc \
- lib/EsiGunzip.cc \
- lib/EsiProcessor.cc \
- lib/Expression.cc \
- lib/FailureInfo.cc \
- lib/Stats.cc \
- lib/Utils.cc \
- lib/Variables.cc \
- lib/gzip.cc \
- test/print_funcs.cc \
- test/HandlerMap.cc \
- test/StubIncludeHandler.cc \
- test/TestHandlerManager.cc
-
-esi_la_SOURCES = \
- esi.cc \
- fetcher/HttpDataFetcherImpl.cc \
- serverIntercept.cc
-
-combo_handler_la_SOURCES = \
- combo_handler.cc \
- fetcher/HttpDataFetcherImpl.cc
-
-esi_la_LIBADD = libesicore.la
-esi_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-combo_handler_la_LIBADD = libesicore.la
-combo_handler_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-docnode_test_SOURCES = test/docnode_test.cc
-docnode_test_LDADD = libtest.la -lz
-
-parser_test_SOURCES = test/parser_test.cc
-parser_test_LDADD = libtest.la -lz
-
-processor_test_SOURCES = test/processor_test.cc
-processor_test_LDADD = libtest.la -lz
-
-utils_test_SOURCES = test/utils_test.cc
-utils_test_LDADD = libtest.la -lz
-
-vars_test_SOURCES = test/vars_test.cc
-vars_test_LDADD = libtest.la -lz
-
-gzip_test_SOURCES = test/gzip_test.cc
-gzip_test_LDADD = libtest.la -lz
-
-TESTS = $(check_PROGRAMS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/esi/Makefile.inc b/plugins/esi/Makefile.inc
new file mode 100644
index 0000000..113f3b1
--- /dev/null
+++ b/plugins/esi/Makefile.inc
@@ -0,0 +1,143 @@
+# 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.
+
+ESI_CPPFLAGS = \
+ -I$(srcdir)/esi \
+ -I$(srcdir)/esi/lib \
+ -I$(srcdir)/esi/fetcher \
+ -I$(srcdir)/esi/test \
+ $(TS_PLUGIN_CPPFLAGS)
+
+# Add -Wno-deprecated because ESI uses ext/hash_map.
+ESI_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
+ -Wno-deprecated
+
+noinst_LTLIBRARIES += \
+ esi/libesicore.la \
+ esi/libtest.la
+
+pkglib_LTLIBRARIES += \
+ esi/esi.la \
+ esi/combo_handler.la
+
+check_PROGRAMS += \
+ esi/docnode_test \
+ esi/parser_test \
+ esi/processor_test \
+ esi/utils_test \
+ esi/vars_test \
+ esi/gzip_test
+
+esi_libesicore_la_SOURCES = \
+ esi/lib/Attribute.h \
+ esi/lib/ComponentBase.h \
+ esi/lib/DocNode.cc \
+ esi/lib/DocNode.h \
+ esi/lib/EsiGunzip.cc \
+ esi/lib/EsiGunzip.h \
+ esi/lib/EsiGzip.cc \
+ esi/lib/EsiGzip.h \
+ esi/lib/EsiParser.cc \
+ esi/lib/EsiParser.h \
+ esi/lib/EsiProcessor.cc \
+ esi/lib/EsiProcessor.h \
+ esi/lib/Expression.cc \
+ esi/lib/Expression.h \
+ esi/lib/FailureInfo.cc \
+ esi/lib/FailureInfo.h \
+ esi/lib/HandlerManager.h \
+ esi/lib/HttpHeader.h \
+ esi/lib/IncludeHandlerFactory.h \
+ esi/lib/SpecialIncludeHandler.h \
+ esi/lib/Stats.cc \
+ esi/lib/Stats.h \
+ esi/lib/StringHash.h \
+ esi/lib/Utils.cc \
+ esi/lib/Utils.h \
+ esi/lib/Variables.cc \
+ esi/lib/Variables.h \
+ esi/lib/gzip.cc \
+ esi/lib/gzip.h
+
+esi_libesicore_la_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_libesicore_la_CXXFLAGS = $(ESI_CXXFLAGS)
+
+# NOTE: HandlerManager::getHandler() is implemented differently in
+# HandlerManager.cc and TestHandlerManager.cc. The unit tests depend
+# on the TestHandlerManager.cc implementation, so don't accidentally
+# link the wrong one into libtest.
+
+esi_libtest_la_SOURCES = \
+ esi/test/print_funcs.cc \
+ esi/test/HandlerMap.cc \
+ esi/test/StubIncludeHandler.cc \
+ esi/test/TestHandlerManager.cc
+
+esi_libtest_la_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_libtest_la_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_libtest_la_LIBADD = esi/libesicore.la
+
+esi_esi_la_SOURCES = \
+ esi/esi.cc \
+ esi/fetcher/HttpDataFetcherImpl.cc \
+ esi/lib/HandlerManager.cc \
+ esi/serverIntercept.cc
+
+esi_esi_la_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_esi_la_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_esi_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+esi_esi_la_LIBADD = esi/libesicore.la
+
+esi_combo_handler_la_SOURCES = \
+ esi/combo_handler.cc \
+ esi/fetcher/HttpDataFetcherImpl.cc \
+ esi/lib/HandlerManager.cc
+
+esi_combo_handler_la_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_combo_handler_la_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_combo_handler_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+esi_combo_handler_la_LIBADD = esi/libesicore.la
+
+esi_docnode_test_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_docnode_test_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_docnode_test_LDADD = esi/libtest.la -lz
+esi_docnode_test_SOURCES = esi/test/docnode_test.cc
+
+esi_parser_test_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_parser_test_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_parser_test_LDADD = esi/libtest.la -lz
+esi_parser_test_SOURCES = esi/test/parser_test.cc
+
+esi_processor_test_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_processor_test_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_processor_test_LDADD = esi/libtest.la -lz
+esi_processor_test_SOURCES = esi/test/processor_test.cc
+
+esi_utils_test_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_utils_test_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_utils_test_LDADD = esi/libtest.la -lz
+esi_utils_test_SOURCES = esi/test/utils_test.cc
+
+esi_vars_test_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_vars_test_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_vars_test_LDADD = esi/libtest.la -lz
+esi_vars_test_SOURCES = esi/test/vars_test.cc
+
+esi_gzip_test_CPPFLAGS = $(ESI_CPPFLAGS)
+esi_gzip_test_CXXFLAGS = $(ESI_CXXFLAGS)
+esi_gzip_test_LDADD = esi/libtest.la -lz
+esi_gzip_test_SOURCES = esi/test/gzip_test.cc
diff --git a/plugins/generator/Makefile.am b/plugins/generator/Makefile.am
deleted file mode 100644
index 5a0ee3d..0000000
--- a/plugins/generator/Makefile.am
+++ /dev/null
@@ -1,27 +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
-
-pkglib_LTLIBRARIES = generator.la
-generator_la_SOURCES = generator.cc
-generator_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/xdebug/Makefile.am b/plugins/generator/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/generator/Makefile.inc
index e28c305..0d685ec 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/generator/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += generator/generator.la
+generator_generator_la_SOURCES = generator/generator.cc
diff --git a/plugins/gzip/Makefile.am b/plugins/gzip/Makefile.am
deleted file mode 100644
index c7ee9ee..0000000
--- a/plugins/gzip/Makefile.am
+++ /dev/null
@@ -1,26 +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
-
-pkglib_LTLIBRARIES = gzip.la
-gzip_la_SOURCES = gzip.cc configuration.cc misc.cc
-gzip_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/xdebug/Makefile.am b/plugins/gzip/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/gzip/Makefile.inc
index e28c305..3cd845c 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/gzip/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += gzip/gzip.la
+gzip_gzip_la_SOURCES = gzip/gzip.cc gzip/configuration.cc gzip/misc.cc
diff --git a/plugins/header_rewrite/Makefile.am b/plugins/header_rewrite/Makefile.am
deleted file mode 100644
index d8e730a..0000000
--- a/plugins/header_rewrite/Makefile.am
+++ /dev/null
@@ -1,47 +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
-
-pkglib_LTLIBRARIES = header_rewrite.la
-header_rewrite_la_SOURCES = \
- condition.cc \
- conditions.cc \
- expander.cc \
- factory.cc \
- header_rewrite.cc \
- lulu.cc \
- operator.cc \
- operators.cc \
- parser.cc \
- regex_helper.cc \
- resources.cc \
- ruleset.cc \
- statement.cc
-
-header_rewrite_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-header_rewrite_la_LIBADD = $(GEO_LIBS)
-
-check_PROGRAMS = header_rewrite_test
-header_rewrite_test_SOURCES = parser.cc header_rewrite_test.cc
-header_rewrite_test_CXXFLAGS = $(AM_CXXFLAGS)
-
-TESTS = $(check_PROGRAMS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/header_rewrite/Makefile.inc b/plugins/header_rewrite/Makefile.inc
new file mode 100644
index 0000000..436e3da
--- /dev/null
+++ b/plugins/header_rewrite/Makefile.inc
@@ -0,0 +1,60 @@
+# 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.
+
+pkglib_LTLIBRARIES += header_rewrite/header_rewrite.la
+
+noinst_LTLIBRARIES += header_rewrite/parser.la
+
+header_rewrite_header_rewrite_la_SOURCES = \
+ header_rewrite/condition.cc \
+ header_rewrite/condition.h \
+ header_rewrite/conditions.cc \
+ header_rewrite/conditions.h \
+ header_rewrite/expander.cc \
+ header_rewrite/expander.h \
+ header_rewrite/factory.cc \
+ header_rewrite/factory.h \
+ header_rewrite/header_rewrite.cc \
+ header_rewrite/lulu.cc \
+ header_rewrite/lulu.h \
+ header_rewrite/matcher.h \
+ header_rewrite/operator.cc \
+ header_rewrite/operator.h \
+ header_rewrite/operators.cc \
+ header_rewrite/operators.h \
+ header_rewrite/regex_helper.cc \
+ header_rewrite/regex_helper.h \
+ header_rewrite/resources.cc \
+ header_rewrite/resources.h \
+ header_rewrite/ruleset.cc \
+ header_rewrite/ruleset.h \
+ header_rewrite/statement.cc \
+ header_rewrite/statement.h \
+ header_rewrite/value.h
+
+header_rewrite_parser_la_SOURCES = \
+ header_rewrite/parser.cc \
+ header_rewrite/parser.h
+
+header_rewrite_header_rewrite_la_LIBADD = \
+ header_rewrite/parser.la \
+ $(GEO_LIBS)
+
+check_PROGRAMS += header_rewrite/header_rewrite_test
+header_rewrite_header_rewrite_test_SOURCES = \
+ header_rewrite/header_rewrite_test.cc
+header_rewrite_header_rewrite_test_LDADD = \
+ header_rewrite/parser.la
diff --git a/plugins/healthchecks/Makefile.am b/plugins/healthchecks/Makefile.am
deleted file mode 100644
index 20d68ef..0000000
--- a/plugins/healthchecks/Makefile.am
+++ /dev/null
@@ -1,30 +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
-
-if BUILD_HEALTHCHECK_PLUGIN
-
-pkglib_LTLIBRARIES = healthchecks.la
-healthchecks_la_SOURCES = healthchecks.c
-healthchecks_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-endif
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/xdebug/Makefile.am b/plugins/healthchecks/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/healthchecks/Makefile.inc
index e28c305..2121b72 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/healthchecks/Makefile.inc
@@ -14,14 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+if BUILD_HEALTHCHECK_PLUGIN
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+pkglib_LTLIBRARIES += healthchecks/healthchecks.la
+healthchecks_healthchecks_la_SOURCES = healthchecks/healthchecks.c
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+endif
diff --git a/plugins/s3_auth/Makefile.am b/plugins/libloader/Makefile.inc
similarity index 77%
rename from plugins/s3_auth/Makefile.am
rename to plugins/libloader/Makefile.inc
index d4ecca1..bc1c9d2 100644
--- a/plugins/s3_auth/Makefile.am
+++ b/plugins/libloader/Makefile.inc
@@ -14,13 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += libloader/libloader.la
-pkglib_LTLIBRARIES = s3_auth.la
-s3_auth_la_SOURCES = s3_auth.cc
-s3_auth_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+libloader_libloader_la_SOURCES = \
+ libloader/libloader.c
+ libloader/libloader.h
diff --git a/plugins/regex_remap/Makefile.am b/plugins/regex_remap/Makefile.am
deleted file mode 100644
index 8e4c41c..0000000
--- a/plugins/regex_remap/Makefile.am
+++ /dev/null
@@ -1,26 +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
-
-pkglib_LTLIBRARIES = regex_remap.la
-regex_remap_la_SOURCES = regex_remap.cc
-regex_remap_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/xdebug/Makefile.am b/plugins/regex_remap/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/regex_remap/Makefile.inc
index e28c305..0a1cda2 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/regex_remap/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += regex_remap/regex_remap.la
+regex_remap_regex_remap_la_SOURCES = regex_remap/regex_remap.cc
diff --git a/plugins/regex_revalidate/Makefile.am b/plugins/regex_revalidate/Makefile.am
deleted file mode 100644
index abbec68..0000000
--- a/plugins/regex_revalidate/Makefile.am
+++ /dev/null
@@ -1,26 +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
-
-pkglib_LTLIBRARIES = regex_revalidate.la
-regex_revalidate_la_SOURCES = regex_revalidate.c
-regex_revalidate_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/xdebug/Makefile.am b/plugins/regex_revalidate/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/regex_revalidate/Makefile.inc
index e28c305..30dce81 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/regex_revalidate/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += regex_revalidate/regex_revalidate.la
+regex_revalidate_regex_revalidate_la_SOURCES = regex_revalidate/regex_revalidate.c
diff --git a/plugins/xdebug/Makefile.am b/plugins/s3_auth/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/s3_auth/Makefile.inc
index e28c305..eb63887 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/s3_auth/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += s3_auth/s3_auth.la
+s3_auth_s3_auth_la_SOURCES = s3_auth/s3_auth.cc
diff --git a/plugins/stats_over_http/Makefile.am b/plugins/stats_over_http/Makefile.am
deleted file mode 100644
index caea205..0000000
--- a/plugins/stats_over_http/Makefile.am
+++ /dev/null
@@ -1,26 +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
-
-pkglib_LTLIBRARIES = stats_over_http.la
-stats_over_http_la_SOURCES = stats_over_http.c
-stats_over_http_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/xdebug/Makefile.am b/plugins/stats_over_http/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/stats_over_http/Makefile.inc
index e28c305..0a0d739 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/stats_over_http/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += stats_over_http/stats_over_http.la
+stats_over_http_stats_over_http_la_SOURCES = stats_over_http/stats_over_http.c
diff --git a/plugins/xdebug/Makefile.am b/plugins/tcpinfo/Makefile.inc
similarity index 77%
copy from plugins/xdebug/Makefile.am
copy to plugins/tcpinfo/Makefile.inc
index e28c305..4664502 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/tcpinfo/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += tcpinfo/tcpinfo.la
+tcpinfo_tcpinfo_la_SOURCES = tcpinfo/tcpinfo.cc
diff --git a/plugins/xdebug/Makefile.am b/plugins/xdebug/Makefile.inc
similarity index 77%
rename from plugins/xdebug/Makefile.am
rename to plugins/xdebug/Makefile.inc
index e28c305..1e41324 100644
--- a/plugins/xdebug/Makefile.am
+++ b/plugins/xdebug/Makefile.inc
@@ -14,14 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = xdebug.la
-xdebug_la_SOURCES = xdebug.cc
-xdebug_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+pkglib_LTLIBRARIES += xdebug/xdebug.la
+xdebug_xdebug_la_SOURCES = xdebug/xdebug.cc
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].