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/26 15:59:18 UTC
[trafficserver] branch master updated: TS-5000: Moves experimental
plugins to the new include mechanism
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 d5c81c1 TS-5000: Moves experimental plugins to the new include mechanism
d5c81c1 is described below
commit d5c81c18c7d7c67b5204fb89dd0815bd82053bd3
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Tue Oct 25 22:22:27 2016 -0600
TS-5000: Moves experimental plugins to the new include mechanism
---
configure.ac | 31 ------------
plugins/Makefile.am | 52 +++++++++++++++++--
plugins/experimental/Makefile.am | 39 +-------------
.../{remap_purge/Makefile.am => acme/Makefile.inc} | 10 ++--
.../Makefile.am => balancer/Makefile.inc} | 16 +++---
.../Makefile.am => buffer_upload/Makefile.inc} | 12 ++---
.../Makefile.am => cache_key_genid/Makefile.inc} | 14 ++---
plugins/experimental/cache_promote/Makefile.am | 26 ----------
.../Makefile.am => cache_promote/Makefile.inc} | 13 ++---
.../experimental/cache_range_requests/Makefile.am | 26 ----------
.../Makefile.inc} | 13 ++---
.../cachekey/{Makefile.am => Makefile.inc} | 17 +++----
.../experimental/collapsed_connection/Makefile.am | 26 ----------
.../Makefile.inc} | 13 ++---
.../experimental/collapsed_forwarding/Makefile.am | 26 ----------
.../Makefile.inc} | 10 ++--
plugins/experimental/custom_redirect/Makefile.am | 27 ----------
.../Makefile.am => custom_redirect/Makefile.inc} | 10 ++--
.../{remap_purge/Makefile.am => epic/Makefile.inc} | 10 ++--
.../Makefile.am => escalate/Makefile.inc} | 10 ++--
plugins/experimental/geoip_acl/Makefile.am | 27 ----------
.../Makefile.am => geoip_acl/Makefile.inc} | 14 ++---
.../Makefile.am => header_freq/Makefile.inc} | 11 ++--
plugins/experimental/header_normalize/Makefile.am | 26 ----------
.../Makefile.am => header_normalize/Makefile.inc} | 10 ++--
.../Makefile.am => hipes/Makefile.inc} | 10 ++--
plugins/experimental/hook-trace/Makefile.am | 26 ----------
.../Makefile.am => hook-trace/Makefile.inc} | 10 ++--
plugins/experimental/inliner/Makefile.am | 38 --------------
.../{balancer/Makefile.am => inliner/Makefile.inc} | 18 ++++---
.../memcache/{Makefile.am => Makefile.inc} | 16 ++----
plugins/experimental/memcached_remap/Makefile.am | 33 ------------
.../Makefile.am => memcached_remap/Makefile.inc} | 13 ++---
plugins/experimental/metalink/Makefile.am | 26 ----------
.../Makefile.am => metalink/Makefile.inc} | 10 ++--
plugins/experimental/mp4/Makefile.am | 26 ----------
.../{remap_purge/Makefile.am => mp4/Makefile.inc} | 13 +++--
plugins/experimental/multiplexer/Makefile.am | 37 --------------
.../Makefile.am => multiplexer/Makefile.inc} | 19 +++----
.../remap_purge/{Makefile.am => Makefile.inc} | 10 ++--
plugins/experimental/remap_stats/Makefile.am | 30 -----------
.../Makefile.am => remap_stats/Makefile.inc} | 10 ++--
plugins/experimental/ssl_cert_loader/Makefile.am | 30 -----------
.../Makefile.am => ssl_cert_loader/Makefile.inc} | 14 ++---
.../stale_while_revalidate/Makefile.am | 26 ----------
.../Makefile.inc} | 13 ++---
plugins/experimental/stream_editor/Makefile.am | 26 ----------
.../Makefile.am => stream_editor/Makefile.inc} | 10 ++--
plugins/experimental/ts_lua/Makefile.am | 59 ----------------------
plugins/experimental/ts_lua/Makefile.inc | 48 ++++++++++++++++++
plugins/experimental/url_sig/Makefile.am | 26 ----------
.../Makefile.am => url_sig/Makefile.inc} | 10 ++--
.../webp_transform/{Makefile.am => Makefile.inc} | 24 ++++-----
53 files changed, 227 insertions(+), 893 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9d62b4c..369818c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1879,39 +1879,8 @@ AC_CONFIG_FILES([
mgmt/utils/Makefile
plugins/Makefile
plugins/experimental/Makefile
- plugins/experimental/acme/Makefile
- plugins/experimental/balancer/Makefile
- plugins/experimental/buffer_upload/Makefile
- plugins/experimental/cache_key_genid/Makefile
- plugins/experimental/cache_promote/Makefile
- plugins/experimental/cache_range_requests/Makefile
- plugins/experimental/cachekey/Makefile
- plugins/experimental/collapsed_connection/Makefile
- plugins/experimental/collapsed_forwarding/Makefile
- plugins/experimental/custom_redirect/Makefile
- plugins/experimental/epic/Makefile
- plugins/experimental/escalate/Makefile
- plugins/experimental/geoip_acl/Makefile
- plugins/experimental/header_freq/Makefile
- plugins/experimental/header_normalize/Makefile
- plugins/experimental/hipes/Makefile
- plugins/experimental/hook-trace/Makefile
- plugins/experimental/inliner/Makefile
- plugins/experimental/memcache/Makefile
- plugins/experimental/memcached_remap/Makefile
- plugins/experimental/metalink/Makefile
- plugins/experimental/mp4/Makefile
- plugins/experimental/multiplexer/Makefile
plugins/experimental/mysql_remap/Makefile
- plugins/experimental/remap_purge/Makefile
- plugins/experimental/remap_stats/Makefile
- plugins/experimental/ssl_cert_loader/Makefile
plugins/experimental/sslheaders/Makefile
- plugins/experimental/stale_while_revalidate/Makefile
- plugins/experimental/stream_editor/Makefile
- plugins/experimental/ts_lua/Makefile
- plugins/experimental/url_sig/Makefile
- plugins/experimental/webp_transform/Makefile
proxy/Makefile
proxy/api/ts/Makefile
proxy/config/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index bc9fdfd..38c3147 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -27,10 +27,6 @@ SUBDIRS =
AM_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-if BUILD_EXPERIMENTAL_PLUGINS
-SUBDIRS += experimental
-endif
-
include authproxy/Makefile.inc
include background_fetch/Makefile.inc
include conf_remap/Makefile.inc
@@ -47,6 +43,54 @@ include stats_over_http/Makefile.inc
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
+include experimental/cache_promote/Makefile.inc
+include experimental/cache_range_requests/Makefile.inc
+include experimental/cachekey/Makefile.inc
+include experimental/collapsed_connection/Makefile.inc
+include experimental/collapsed_forwarding/Makefile.inc
+include experimental/custom_redirect/Makefile.inc
+include experimental/epic/Makefile.inc
+include experimental/escalate/Makefile.inc
+include experimental/geoip_acl/Makefile.inc
+include experimental/header_freq/Makefile.inc
+include experimental/header_normalize/Makefile.inc
+include experimental/hipes/Makefile.inc
+include experimental/hook-trace/Makefile.inc
+include experimental/inliner/Makefile.inc
+include experimental/memcache/Makefile.inc
+include experimental/metalink/Makefile.inc
+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/stale_while_revalidate/Makefile.inc
+include experimental/stream_editor/Makefile.inc
+include experimental/ts_lua/Makefile.inc
+include experimental/url_sig/Makefile.inc
+
+if BUILD_MEMCACHED_REMAP_PLUGIN
+include experimental/memcached_remap/Makefile.inc
+endif
+
+if BUILD_REMAP_STATS_PLUGIN
+include experimental/remap_stats/Makefile.inc
+endif
+
+if HAS_KYOTOCABINET
+include experimental/cache_key_genid/Makefile.inc
+endif
+
+if BUILD_WEBP_TRANSFORM_PLUGIN
+include experimental/webp_transform/Makefile.inc
+endif
+
+SUBDIRS += experimental
+endif
+
TESTS = $(check_PROGRAMS)
tidy-local: $(DIST_SOURCES)
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index f077d60..f81af00 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -15,49 +15,12 @@
# limitations under the License.
SUBDIRS = \
- acme \
- balancer \
- buffer_upload \
- cache_promote \
- cache_range_requests \
- cachekey \
- collapsed_connection \
- collapsed_forwarding \
- custom_redirect \
- epic \
- escalate \
- geoip_acl \
- header_normalize \
- header_freq \
- hipes \
- hook-trace \
- inliner \
- memcache \
- memcached_remap \
- metalink \
- mp4 \
- multiplexer \
- remap_purge \
- remap_stats \
- ssl_cert_loader \
- sslheaders \
- stale_while_revalidate \
- stream_editor \
- ts_lua \
- url_sig
-
-if BUILD_WEBP_TRANSFORM_PLUGIN
- SUBDIRS += webp_transform
-endif
+ sslheaders
if HAS_MYSQL
SUBDIRS += mysql_remap
endif
-if HAS_KYOTOCABINET
- SUBDIRS += cache_key_genid
-endif
-
include $(top_srcdir)/build/tidy.mk
tidy-local: $(DIST_SOURCES)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/acme/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/acme/Makefile.inc
index 9ffcb1a..a2f3b4a 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/acme/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/acme/acme.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_acme_acme_la_SOURCES = \
+ experimental/acme/acme.c
diff --git a/plugins/experimental/header_freq/Makefile.am b/plugins/experimental/balancer/Makefile.inc
similarity index 76%
rename from plugins/experimental/header_freq/Makefile.am
rename to plugins/experimental/balancer/Makefile.inc
index b83eccd..6c93be5 100644
--- a/plugins/experimental/header_freq/Makefile.am
+++ b/plugins/experimental/balancer/Makefile.inc
@@ -14,14 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/balancer/balancer.la
-pkglib_LTLIBRARIES = header_freq.la
-header_freq_la_SOURCES = header_freq.cc
-header_freq_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_balancer_balancer_la_SOURCES = \
+ experimental/balancer/balancer.cc\
+ experimental/balancer/roundrobin.cc \
+ experimental/balancer/hash.cc \
+ experimental/balancer/balancer.h
diff --git a/plugins/experimental/acme/Makefile.am b/plugins/experimental/buffer_upload/Makefile.inc
similarity index 78%
rename from plugins/experimental/acme/Makefile.am
rename to plugins/experimental/buffer_upload/Makefile.inc
index 2003dff..ee820e2 100644
--- a/plugins/experimental/acme/Makefile.am
+++ b/plugins/experimental/buffer_upload/Makefile.inc
@@ -14,13 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/buffer_upload/buffer_upload.la
-pkglib_LTLIBRARIES = acme.la
-acme_la_SOURCES = acme.c
-acme_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_buffer_upload_buffer_upload_la_SOURCES = \
+ experimental/buffer_upload/buffer_upload.cc
diff --git a/plugins/experimental/balancer/Makefile.am b/plugins/experimental/cache_key_genid/Makefile.inc
similarity index 73%
copy from plugins/experimental/balancer/Makefile.am
copy to plugins/experimental/cache_key_genid/Makefile.inc
index 1f6bdd3..a5c8ead 100644
--- a/plugins/experimental/balancer/Makefile.am
+++ b/plugins/experimental/cache_key_genid/Makefile.inc
@@ -14,14 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/cache_key_genid/cache_key_genid.la
-pkglib_LTLIBRARIES = balancer.la
-balancer_la_SOURCES = balancer.cc roundrobin.cc hash.cc balancer.h
-balancer_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
+experimental_cache_key_genid_cache_key_genid_la_SOURCES = \
+ experimental/cache_key_genid/cache_key_genid.c
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_cache_key_genid_cache_key_genid_la_LDFLAGS = \
+ $(TS_PLUGIN_LD_FLAGS) $(LIB_KYOTOCABINET)
diff --git a/plugins/experimental/cache_promote/Makefile.am b/plugins/experimental/cache_promote/Makefile.am
deleted file mode 100644
index fede4c7..0000000
--- a/plugins/experimental/cache_promote/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 = cache_promote.la
-cache_promote_la_SOURCES = cache_promote.cc
-cache_promote_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/epic/Makefile.am b/plugins/experimental/cache_promote/Makefile.inc
similarity index 78%
copy from plugins/experimental/epic/Makefile.am
copy to plugins/experimental/cache_promote/Makefile.inc
index 2ae65d8..c2e9f93 100644
--- a/plugins/experimental/epic/Makefile.am
+++ b/plugins/experimental/cache_promote/Makefile.inc
@@ -14,14 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/cache_promote/cache_promote.la
-pkglib_LTLIBRARIES = epic.la
-epic_la_SOURCES = epic.cc
-epic_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_cache_promote_cache_promote_la_SOURCES = \
+ experimental/cache_promote/cache_promote.cc
diff --git a/plugins/experimental/cache_range_requests/Makefile.am b/plugins/experimental/cache_range_requests/Makefile.am
deleted file mode 100644
index f5ced31..0000000
--- a/plugins/experimental/cache_range_requests/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 = cache_range_requests.la
-cache_range_requests_la_SOURCES = cache_range_requests.cc
-cache_range_requests_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/hipes/Makefile.am b/plugins/experimental/cache_range_requests/Makefile.inc
similarity index 78%
rename from plugins/experimental/hipes/Makefile.am
rename to plugins/experimental/cache_range_requests/Makefile.inc
index 075baf1..ff3454a 100644
--- a/plugins/experimental/hipes/Makefile.am
+++ b/plugins/experimental/cache_range_requests/Makefile.inc
@@ -14,14 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/cache_range_requests/cache_range_requests.la
-pkglib_LTLIBRARIES = hipes.la
-
-hipes_la_SOURCES = hipes.cc
-hipes_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_cache_range_requests_cache_range_requests_la_SOURCES = \
+ experimental/cache_range_requests/cache_range_requests.cc
diff --git a/plugins/experimental/cachekey/Makefile.am b/plugins/experimental/cachekey/Makefile.inc
similarity index 77%
rename from plugins/experimental/cachekey/Makefile.am
rename to plugins/experimental/cachekey/Makefile.inc
index 7bfda04..aca2adb 100644
--- a/plugins/experimental/cachekey/Makefile.am
+++ b/plugins/experimental/cachekey/Makefile.inc
@@ -14,17 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = cachekey.la
-cachekey_la_SOURCES = cachekey.cc common.cc configs.cc pattern.cc plugin.cc
-cachekey_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
+pkglib_LTLIBRARIES += experimental/cachekey/cachekey.la
+experimental_cachekey_cachekey_la_SOURCES = \
+ experimental/cachekey/cachekey.cc \
+ experimental/cachekey/common.cc \
+ experimental/cachekey/configs.cc \
+ experimental/cachekey/pattern.cc \
+ experimental/cachekey/plugin.cc
VIRTUALENV_DIR = ../../../ci/tsqa/virtualenv
tsqa: $(VIRTUALENV_DIR)
@. $(VIRTUALENV_DIR)/bin/activate && $(VIRTUALENV_DIR)/bin/nosetests --with-xunit -sv --logging-level=INFO
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/collapsed_connection/Makefile.am b/plugins/experimental/collapsed_connection/Makefile.am
deleted file mode 100644
index 32b6b32..0000000
--- a/plugins/experimental/collapsed_connection/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 = collapsed_connection.la
-collapsed_connection_la_SOURCES = collapsed_connection.cc MurmurHash3.cc
-collapsed_connection_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/buffer_upload/Makefile.am b/plugins/experimental/collapsed_connection/Makefile.inc
similarity index 75%
rename from plugins/experimental/buffer_upload/Makefile.am
rename to plugins/experimental/collapsed_connection/Makefile.inc
index e5b4d69..15a0e51 100644
--- a/plugins/experimental/buffer_upload/Makefile.am
+++ b/plugins/experimental/collapsed_connection/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 += experimental/collapsed_connection/collapsed_connection.la
-pkglib_LTLIBRARIES = buffer_upload.la
-buffer_upload_la_SOURCES = buffer_upload.cc
-buffer_upload_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_collapsed_connection_collapsed_connection_la_SOURCES = \
+ experimental/collapsed_connection/collapsed_connection.cc \
+ experimental/collapsed_connection/MurmurHash3.cc
diff --git a/plugins/experimental/collapsed_forwarding/Makefile.am b/plugins/experimental/collapsed_forwarding/Makefile.am
deleted file mode 100644
index 9561fb7..0000000
--- a/plugins/experimental/collapsed_forwarding/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 = collapsed_forwarding.la
-collapsed_forwarding_la_SOURCES = collapsed_forwarding.cc
-collapsed_forwarding_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/collapsed_forwarding/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/collapsed_forwarding/Makefile.inc
index 9ffcb1a..3326b93 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/collapsed_forwarding/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/collapsed_forwarding/collapsed_forwarding.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_collapsed_forwarding_collapsed_forwarding_la_SOURCES = \
+ experimental/collapsed_forwarding/collapsed_forwarding.cc
diff --git a/plugins/experimental/custom_redirect/Makefile.am b/plugins/experimental/custom_redirect/Makefile.am
deleted file mode 100644
index dfa3e10..0000000
--- a/plugins/experimental/custom_redirect/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 = custom_redirect.la
-custom_redirect_la_SOURCES = custom_redirect.cc
-custom_redirect_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/custom_redirect/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/custom_redirect/Makefile.inc
index 9ffcb1a..a0518de 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/custom_redirect/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/custom_redirect/custom_redirect.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_custom_redirect_custom_redirect_la_SOURCES = \
+ experimental/custom_redirect/custom_redirect.cc
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/epic/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/epic/Makefile.inc
index 9ffcb1a..1a68d60 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/epic/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/epic/epic.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_epic_epic_la_SOURCES = \
+ experimental/epic/epic.cc
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/escalate/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/escalate/Makefile.inc
index 9ffcb1a..4ccd52f 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/escalate/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/escalate/escalate.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_escalate_escalate_la_SOURCES = \
+ experimental/escalate/escalate.cc
diff --git a/plugins/experimental/geoip_acl/Makefile.am b/plugins/experimental/geoip_acl/Makefile.am
deleted file mode 100644
index b81b4e1..0000000
--- a/plugins/experimental/geoip_acl/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 = geoip_acl.la
-geoip_acl_la_SOURCES = acl.cc geoip_acl.cc
-geoip_acl_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-geoip_acl_la_LIBADD = $(GEO_LIBS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/escalate/Makefile.am b/plugins/experimental/geoip_acl/Makefile.inc
similarity index 77%
rename from plugins/experimental/escalate/Makefile.am
rename to plugins/experimental/geoip_acl/Makefile.inc
index aa608d6..3ff84f6 100644
--- a/plugins/experimental/escalate/Makefile.am
+++ b/plugins/experimental/geoip_acl/Makefile.inc
@@ -14,14 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/geoip_acl/geoip_acl.la
-pkglib_LTLIBRARIES = escalate.la
-escalate_la_SOURCES = escalate.cc
-escalate_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
+experimental_geoip_acl_geoip_acl_la_SOURCES = \
+ experimental/geoip_acl/acl.cc \
+ experimental/geoip_acl/geoip_acl.cc
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_geoip_acl_geoip_acl_la_LIBADD = $(GEO_LIBS)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/header_freq/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/header_freq/Makefile.inc
index 9ffcb1a..b26ce4f 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/header_freq/Makefile.inc
@@ -14,11 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+pkglib_LTLIBRARIES += experimental/header_freq/header_freq.la
+experimental_header_freq_header_freq_la_SOURCES = \
+ experimental/header_freq/header_freq.cc
diff --git a/plugins/experimental/header_normalize/Makefile.am b/plugins/experimental/header_normalize/Makefile.am
deleted file mode 100644
index 31bae14..0000000
--- a/plugins/experimental/header_normalize/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 = header_normalize.la
-header_normalize_la_SOURCES = header_normalize.cc
-header_normalize_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/header_normalize/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/header_normalize/Makefile.inc
index 9ffcb1a..2224fa0 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/header_normalize/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/header_normalize/header_normalize.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_header_normalize_header_normalize_la_SOURCES = \
+ experimental/header_normalize/header_normalize.cc
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/hipes/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/hipes/Makefile.inc
index 9ffcb1a..412cd02 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/hipes/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/hipes/hipes.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_hipes_hipes_la_SOURCES = \
+ experimental/hipes/hipes.cc
diff --git a/plugins/experimental/hook-trace/Makefile.am b/plugins/experimental/hook-trace/Makefile.am
deleted file mode 100644
index 192cd72..0000000
--- a/plugins/experimental/hook-trace/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 = hook-trace.la
-hook_trace_la_SOURCES = hook-trace.cc
-hook_trace_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/hook-trace/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/hook-trace/Makefile.inc
index 9ffcb1a..2eb0e93 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/hook-trace/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/hook-trace/hook-trace.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_hook_trace_hook_trace_la_SOURCES = \
+ experimental/hook-trace/hook-trace.cc
diff --git a/plugins/experimental/inliner/Makefile.am b/plugins/experimental/inliner/Makefile.am
deleted file mode 100644
index 84dc55a..0000000
--- a/plugins/experimental/inliner/Makefile.am
+++ /dev/null
@@ -1,38 +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 += -DPLUGIN_TAG=\"inliner\"
-
-pkglib_LTLIBRARIES = inliner.la
-
-inliner_la_SOURCES = \
- ats-inliner.cc \
- cache.cc \
- chunk-decoder.cc \
- fetcher.cc \
- html-parser.cc \
- inliner-handler.cc \
- ts.cc
-
-inliner_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/balancer/Makefile.am b/plugins/experimental/inliner/Makefile.inc
similarity index 64%
copy from plugins/experimental/balancer/Makefile.am
copy to plugins/experimental/inliner/Makefile.inc
index 1f6bdd3..18d409f 100644
--- a/plugins/experimental/balancer/Makefile.am
+++ b/plugins/experimental/inliner/Makefile.inc
@@ -14,14 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
-pkglib_LTLIBRARIES = balancer.la
-balancer_la_SOURCES = balancer.cc roundrobin.cc hash.cc balancer.h
-balancer_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
+experimental_inliner_inliner_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TAG=\"inliner\"
+pkglib_LTLIBRARIES += experimental/inliner/inliner.la
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_inliner_inliner_la_SOURCES = \
+ experimental/inliner/ats-inliner.cc \
+ experimental/inliner/cache.cc \
+ experimental/inliner/chunk-decoder.cc \
+ experimental/inliner/fetcher.cc \
+ experimental/inliner/html-parser.cc \
+ experimental/inliner/inliner-handler.cc \
+ experimental/inliner/ts.cc
diff --git a/plugins/experimental/memcache/Makefile.am b/plugins/experimental/memcache/Makefile.inc
similarity index 80%
rename from plugins/experimental/memcache/Makefile.am
rename to plugins/experimental/memcache/Makefile.inc
index ae82d77..1619f5b 100644
--- a/plugins/experimental/memcache/Makefile.am
+++ b/plugins/experimental/memcache/Makefile.inc
@@ -13,9 +13,8 @@
# 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
-tsmemcache_la_CPPFLAGS = \
+experimental_memcache_tsmemcache_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/iocore/aio \
@@ -27,14 +26,7 @@ tsmemcache_la_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts
-pkglib_LTLIBRARIES = tsmemcache.la
+pkglib_LTLIBRARIES += experimental/memcache/tsmemcache.la
-tsmemcache_la_SOURCES = \
- tsmemcache.cc
-
-tsmemcache_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_memcache_tsmemcache_la_SOURCES = \
+ experimental/memcache/tsmemcache.cc
diff --git a/plugins/experimental/memcached_remap/Makefile.am b/plugins/experimental/memcached_remap/Makefile.am
deleted file mode 100644
index 92e299e..0000000
--- a/plugins/experimental/memcached_remap/Makefile.am
+++ /dev/null
@@ -1,33 +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_MEMCACHED_REMAP_PLUGIN
-
-AM_CXXFLAGS += $(LIBMEMCACHED_CFLAGS)
-
-pkglib_LTLIBRARIES = memcached_remap.la
-memcached_remap_la_SOURCES = memcached_remap.cc
-memcached_remap_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-memcached_remap_la_LIBADD = $(LIBMEMCACHED_LIBS)
-
-endif
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/balancer/Makefile.am b/plugins/experimental/memcached_remap/Makefile.inc
similarity index 69%
copy from plugins/experimental/balancer/Makefile.am
copy to plugins/experimental/memcached_remap/Makefile.inc
index 1f6bdd3..cb893b0 100644
--- a/plugins/experimental/balancer/Makefile.am
+++ b/plugins/experimental/memcached_remap/Makefile.inc
@@ -14,14 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+experimental_memcached_remap_memcached_remap_la__CXXFLAGS = $(AM_CXXFLAGS) $(LIBMEMCACHED_CFLAGS)
-pkglib_LTLIBRARIES = balancer.la
-balancer_la_SOURCES = balancer.cc roundrobin.cc hash.cc balancer.h
-balancer_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
+pkglib_LTLIBRARIES += experimental/memcached_remap/memcached_remap.la
+experimental_memcached_remap_memcached_remap_la_SOURCES = \
+ experimental/memcached_remap/memcached_remap.cc
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_memcached_remap_memcached_remap_la_LIBADD = $(LIBMEMCACHED_LIBS)
diff --git a/plugins/experimental/metalink/Makefile.am b/plugins/experimental/metalink/Makefile.am
deleted file mode 100644
index e42bb55..0000000
--- a/plugins/experimental/metalink/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 = metalink.la
-metalink_la_SOURCES = metalink.cc
-metalink_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/metalink/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/metalink/Makefile.inc
index 9ffcb1a..c6b2542 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/metalink/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/metalink/metalink.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_metalink_metalink_la_SOURCES = \
+ experimental/metalink/metalink.cc
diff --git a/plugins/experimental/mp4/Makefile.am b/plugins/experimental/mp4/Makefile.am
deleted file mode 100644
index cc7117e..0000000
--- a/plugins/experimental/mp4/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 = mp4.la
-mp4_la_SOURCES = mp4.cc mp4_common.h mp4_meta.cc mp4_meta.h
-mp4_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/mp4/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/mp4/Makefile.inc
index 9ffcb1a..c5a40a9 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/mp4/Makefile.inc
@@ -14,11 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/mp4/mp4.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_mp4_mp4_la_SOURCES = \
+ experimental/mp4/mp4.cc \
+ experimental/mp4/mp4_common.h \
+ experimental/mp4/mp4_meta.cc \
+ experimental/mp4/mp4_meta.h
diff --git a/plugins/experimental/multiplexer/Makefile.am b/plugins/experimental/multiplexer/Makefile.am
deleted file mode 100644
index f0535dc..0000000
--- a/plugins/experimental/multiplexer/Makefile.am
+++ /dev/null
@@ -1,37 +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 += -DPLUGIN_TAG=\"multiplexer\"
-
-pkglib_LTLIBRARIES = multiplexer.la
-
-multiplexer_la_SOURCES = \
- ats-multiplexer.cc \
- chunk-decoder.cc \
- dispatch.cc \
- fetcher.cc \
- original-request.cc \
- post.cc \
- ts.cc
-
-multiplexer_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/balancer/Makefile.am b/plugins/experimental/multiplexer/Makefile.inc
similarity index 61%
rename from plugins/experimental/balancer/Makefile.am
rename to plugins/experimental/multiplexer/Makefile.inc
index 1f6bdd3..d8ba929 100644
--- a/plugins/experimental/balancer/Makefile.am
+++ b/plugins/experimental/multiplexer/Makefile.inc
@@ -14,14 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+experimental_multiplexer_multiplexer_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TAG=\"multiplexer\"
-pkglib_LTLIBRARIES = balancer.la
-balancer_la_SOURCES = balancer.cc roundrobin.cc hash.cc balancer.h
-balancer_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
+pkglib_LTLIBRARIES += experimental/multiplexer/multiplexer.la
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_multiplexer_multiplexer_la_SOURCES = \
+ experimental/multiplexer/ats-multiplexer.cc \
+ experimental/multiplexer/chunk-decoder.cc \
+ experimental/multiplexer/dispatch.cc \
+ experimental/multiplexer/fetcher.cc \
+ experimental/multiplexer/original-request.cc \
+ experimental/multiplexer/post.cc \
+ experimental/multiplexer/ts.cc
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/remap_purge/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/remap_purge/Makefile.inc
index 9ffcb1a..e1a9b7d 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/remap_purge/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/remap_purge/remap_purge.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_remap_purge_remap_purge_la_SOURCES = \
+ experimental/remap_purge/remap_purge.c
diff --git a/plugins/experimental/remap_stats/Makefile.am b/plugins/experimental/remap_stats/Makefile.am
deleted file mode 100644
index 3bd00ac..0000000
--- a/plugins/experimental/remap_stats/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_REMAP_STATS_PLUGIN
-
-pkglib_LTLIBRARIES = remap_stats.la
-remap_stats_la_SOURCES = remap_stats.c
-remap_stats_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-endif
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/remap_stats/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/remap_stats/Makefile.inc
index 9ffcb1a..9cf318e 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/remap_stats/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/remap_stats/remap_stats.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_remap_stats_remap_stats_la_SOURCES = \
+ experimental/remap_stats/remap_stats.c
diff --git a/plugins/experimental/ssl_cert_loader/Makefile.am b/plugins/experimental/ssl_cert_loader/Makefile.am
deleted file mode 100644
index 5a652db..0000000
--- a/plugins/experimental/ssl_cert_loader/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
-
-AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_srcdir)/lib/ts
-
-pkglib_LTLIBRARIES = ssl_cert_loader.la
-
-ssl_cert_loader_la_SOURCES = ssl-cert-loader.cc domain-tree.cc
-ssl_cert_loader_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-ssl_cert_loader_la_LIBADD = $(top_builddir)/lib/tsconfig/libtsconfig.la
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/cache_key_genid/Makefile.am b/plugins/experimental/ssl_cert_loader/Makefile.inc
similarity index 70%
rename from plugins/experimental/cache_key_genid/Makefile.am
rename to plugins/experimental/ssl_cert_loader/Makefile.inc
index e473f5b..194b011 100644
--- a/plugins/experimental/cache_key_genid/Makefile.am
+++ b/plugins/experimental/ssl_cert_loader/Makefile.inc
@@ -14,14 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/ssl_cert_loader/ssl_cert_loader.la
-pkglib_LTLIBRARIES = cache_key_genid.la
-cache_key_genid_la_SOURCES = cache_key_genid.c
-cache_key_genid_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS) $(LIB_KYOTOCABINET)
+experimental_ssl_cert_loader_ssl_cert_loader_la_SOURCES = \
+ experimental/ssl_cert_loader/ssl-cert-loader.cc \
+ experimental/ssl_cert_loader/domain-tree.cc
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_ssl_cert_loader_ssl_cert_loader_la_LIBADD = $(top_builddir)/lib/tsconfig/libtsconfig.la
diff --git a/plugins/experimental/stale_while_revalidate/Makefile.am b/plugins/experimental/stale_while_revalidate/Makefile.am
deleted file mode 100644
index 68651c7..0000000
--- a/plugins/experimental/stale_while_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 = stale_while_revalidate.la
-stale_while_revalidate_la_SOURCES = stale_while_revalidate.c
-stale_while_revalidate_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/experimental/epic/Makefile.am b/plugins/experimental/stale_while_revalidate/Makefile.inc
similarity index 78%
rename from plugins/experimental/epic/Makefile.am
rename to plugins/experimental/stale_while_revalidate/Makefile.inc
index 2ae65d8..7c8fce6 100644
--- a/plugins/experimental/epic/Makefile.am
+++ b/plugins/experimental/stale_while_revalidate/Makefile.inc
@@ -14,14 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/stale_while_revalidate/stale_while_revalidate.la
-pkglib_LTLIBRARIES = epic.la
-epic_la_SOURCES = epic.cc
-epic_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+experimental_stale_while_revalidate_stale_while_revalidate_la_SOURCES = \
+ experimental/stale_while_revalidate/stale_while_revalidate.c
diff --git a/plugins/experimental/stream_editor/Makefile.am b/plugins/experimental/stream_editor/Makefile.am
deleted file mode 100644
index 20d4bc2..0000000
--- a/plugins/experimental/stream_editor/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 = stream_editor.la
-stream_editor_la_SOURCES = stream_editor.cc
-stream_editor_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/stream_editor/Makefile.inc
similarity index 79%
copy from plugins/experimental/remap_purge/Makefile.am
copy to plugins/experimental/stream_editor/Makefile.inc
index 9ffcb1a..5089676 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/stream_editor/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/stream_editor/stream_editor.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_stream_editor_stream_editor_la_SOURCES = \
+ experimental/stream_editor/stream_editor.cc
diff --git a/plugins/experimental/ts_lua/Makefile.am b/plugins/experimental/ts_lua/Makefile.am
deleted file mode 100644
index 6c4270c..0000000
--- a/plugins/experimental/ts_lua/Makefile.am
+++ /dev/null
@@ -1,59 +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
-
-tslua_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- $(LUAJIT_CPPFLAGS)
-
-pkglib_LTLIBRARIES = tslua.la
-
-tslua_la_SOURCES = \
- ts_lua.c \
- ts_lua_cached_response.c \
- ts_lua_client_request.c \
- ts_lua_client_response.c \
- ts_lua_context.c \
- ts_lua_hook.c \
- ts_lua_http.c \
- ts_lua_http_intercept.c \
- ts_lua_log.c \
- ts_lua_misc.c \
- ts_lua_server_request.c \
- ts_lua_server_response.c \
- ts_lua_transform.c \
- ts_lua_util.c \
- ts_lua_remap.c \
- ts_lua_http_cntl.c \
- ts_lua_http_milestone.c \
- ts_lua_http_config.c \
- ts_lua_mgmt.c \
- ts_lua_package.c \
- ts_lua_string.c \
- ts_lua_crypto.c \
- ts_lua_stat.c \
- ts_lua_io.c \
- ts_lua_coroutine.c \
- ts_lua_fetch.c \
- ts_lua_constant.c
-
-tslua_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/experimental/ts_lua/Makefile.inc b/plugins/experimental/ts_lua/Makefile.inc
new file mode 100644
index 0000000..d4764a6
--- /dev/null
+++ b/plugins/experimental/ts_lua/Makefile.inc
@@ -0,0 +1,48 @@
+# 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.
+
+experimental_ts_lua_tslua_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_CPPFLAGS)
+
+pkglib_LTLIBRARIES += experimental/ts_lua/tslua.la
+
+experimental_ts_lua_tslua_la_SOURCES = \
+ experimental/ts_lua/ts_lua.c \
+ experimental/ts_lua/ts_lua_cached_response.c \
+ experimental/ts_lua/ts_lua_client_request.c \
+ experimental/ts_lua/ts_lua_client_response.c \
+ experimental/ts_lua/ts_lua_context.c \
+ experimental/ts_lua/ts_lua_hook.c \
+ experimental/ts_lua/ts_lua_http.c \
+ experimental/ts_lua/ts_lua_http_intercept.c \
+ experimental/ts_lua/ts_lua_log.c \
+ experimental/ts_lua/ts_lua_misc.c \
+ experimental/ts_lua/ts_lua_server_request.c \
+ experimental/ts_lua/ts_lua_server_response.c \
+ experimental/ts_lua/ts_lua_transform.c \
+ experimental/ts_lua/ts_lua_util.c \
+ experimental/ts_lua/ts_lua_remap.c \
+ experimental/ts_lua/ts_lua_http_cntl.c \
+ experimental/ts_lua/ts_lua_http_milestone.c \
+ experimental/ts_lua/ts_lua_http_config.c \
+ experimental/ts_lua/ts_lua_mgmt.c \
+ experimental/ts_lua/ts_lua_package.c \
+ experimental/ts_lua/ts_lua_string.c \
+ experimental/ts_lua/ts_lua_crypto.c \
+ experimental/ts_lua/ts_lua_stat.c \
+ experimental/ts_lua/ts_lua_io.c \
+ experimental/ts_lua/ts_lua_coroutine.c \
+ experimental/ts_lua/ts_lua_fetch.c \
+ experimental/ts_lua/ts_lua_constant.c
diff --git a/plugins/experimental/url_sig/Makefile.am b/plugins/experimental/url_sig/Makefile.am
deleted file mode 100644
index f2734dd..0000000
--- a/plugins/experimental/url_sig/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 = url_sig.la
-url_sig_la_SOURCES = url_sig.c
-url_sig_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/url_sig/Makefile.inc
similarity index 79%
rename from plugins/experimental/remap_purge/Makefile.am
rename to plugins/experimental/url_sig/Makefile.inc
index 9ffcb1a..73a5c6d 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/url_sig/Makefile.inc
@@ -14,11 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+pkglib_LTLIBRARIES += experimental/url_sig/url_sig.la
-pkglib_LTLIBRARIES = remap_purge.la
-remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
+experimental_url_sig_url_sig_la_SOURCES = \
+ experimental/url_sig/url_sig.c
diff --git a/plugins/experimental/webp_transform/Makefile.am b/plugins/experimental/webp_transform/Makefile.inc
similarity index 63%
rename from plugins/experimental/webp_transform/Makefile.am
rename to plugins/experimental/webp_transform/Makefile.inc
index c89b216..49f48aa 100644
--- a/plugins/experimental/webp_transform/Makefile.am
+++ b/plugins/experimental/webp_transform/Makefile.inc
@@ -15,24 +15,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include $(top_srcdir)/build/plugins.mk
+experimental_webp_transform_WebpTransform_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMAGICKCPP_CFLAGS)
+experimental_webp_transform_WebpTransform_la_CXXFLAGS = $(AM_CXXFLAGS) -Wno-unused-variable
-AM_CPPFLAGS += $(LIBMAGICKCPP_CFLAGS)
+pkglib_LTLIBRARIES += experimental/webp_transform/WebpTransform.la
-AM_CXXFLAGS += \
- -Wno-unused-variable
+experimental_webp_transform_WebpTransform_la_SOURCES = \
+ experimental/webp_transform/ImageTransform.cc
-pkglib_LTLIBRARIES = WebpTransform.la
-
-WebpTransform_la_SOURCES = ImageTransform.cc
-WebpTransform_la_LDFLAGS = \
+experimental_webp_transform_WebpTransform_la_LDFLAGS = \
$(TS_PLUGIN_LD_FLAGS) \
- -L$(top_builddir)/lib/atscppapi/src
-WebpTransform_la_LIBADD = \
+ -L$(top_builddir)/lib/cppapi
+
+experimental_webp_transform_WebpTransform_la_LIBADD = \
-latscppapi \
$(LIBMAGICKCPP_LIBS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].