trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [2/3] git commit: TS-1418 Reorganize some of the Makefile.am slightly for experimental plugins
Date Tue, 04 Sep 2012 18:48:13 GMT
TS-1418 Reorganize some of the Makefile.am slightly for experimental plugins


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7b5c0999
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7b5c0999
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7b5c0999

Branch: refs/heads/master
Commit: 7b5c099919ff85dd571609f5f9c4aeca1c538192
Parents: f14311a
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Tue Sep 4 12:42:35 2012 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Tue Sep 4 12:43:36 2012 -0600

----------------------------------------------------------------------
 CHANGES                          |    5 ++++-
 configure.ac                     |    2 ++
 plugins/Makefile.am              |   12 +-----------
 plugins/experimental/Makefile.am |   26 ++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b5c0999/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index d486c14..060a1f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.0
 
-  *) [TS-1436] Added Yahoo directory layout for installation
+  *) [TS-1436] Added Yahoo directory layout for installation.
+
+  *) [TS-1418] Add automake file to Metalink plugin. Author: Jack Bates.
+   Also reorganize the plugins/experimental Makefile.am stuff slightly.
 
   *) [TS-1414] gzip plugin enhancements
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b5c0999/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5a6b07b..cd37407 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1556,12 +1556,14 @@ AC_CONFIG_FILES([plugins/regex_remap/Makefile])
 AC_CONFIG_FILES([plugins/header_filter/Makefile])
 AC_CONFIG_FILES([plugins/stats_over_http/Makefile])
 # experimental plugins
+AC_CONFIG_FILES([plugins/experimental/Makefile])
 AC_CONFIG_FILES([plugins/experimental/esi/Makefile])
 AC_CONFIG_FILES([plugins/experimental/lua/Makefile])
 AC_CONFIG_FILES([plugins/experimental/rfc5861/Makefile])
 AC_CONFIG_FILES([plugins/experimental/tcp_info/Makefile])
 AC_CONFIG_FILES([plugins/experimental/custom_redirect/Makefile])
 AC_CONFIG_FILES([plugins/experimental/header_rewrite/Makefile])
+AC_CONFIG_FILES([plugins/experimental/metalink/Makefile])
 # various tools
 AC_CONFIG_FILES([tools/Makefile])
 # example plugins

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b5c0999/plugins/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d5bbcf0..d1ae0c8 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,14 +14,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = conf_remap regex_remap header_filter stats_over_http
-
-if BUILD_EXPERIMENTAL_PLUGINS
-SUBDIRS += \
- experimental/lua \
- experimental/esi \
- experimental/rfc5861 \
- experimental/tcp_info \
- experimental/custom_redirect \
- experimental/header_rewrite
-endif
+SUBDIRS = conf_remap regex_remap header_filter stats_over_http experimental

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b5c0999/plugins/experimental/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
new file mode 100644
index 0000000..b194b80
--- /dev/null
+++ b/plugins/experimental/Makefile.am
@@ -0,0 +1,26 @@
+#  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.
+
+if BUILD_EXPERIMENTAL_PLUGINS
+SUBDIRS = \
+ lua \
+ esi \
+ rfc5861 \
+ tcp_info \
+ custom_redirect \
+ header_rewrite \
+ metalink
+endif


Mime
View raw message