You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2013/10/22 23:22:35 UTC
[1/2] git commit: fixing minor build issues with examples
Updated Branches:
refs/heads/master bb5f90963 -> e265ff890
fixing minor build issues with examples
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9c918b68
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9c918b68
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9c918b68
Branch: refs/heads/master
Commit: 9c918b68cc1720228b2d2370f01187d7ae182bf6
Parents: 6c5955a
Author: Brian Geffon <br...@apache.org>
Authored: Tue Oct 22 14:21:33 2013 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Oct 22 14:21:33 2013 -0700
----------------------------------------------------------------------
lib/atscppapi/examples/async_http_fetch/Makefile.am | 4 ++--
lib/atscppapi/examples/async_timer/Makefile.am | 5 ++---
lib/atscppapi/examples/clientredirect/Makefile.am | 5 ++---
lib/atscppapi/examples/clientrequest/Makefile.am | 4 ++--
lib/atscppapi/examples/customresponse/Makefile.am | 4 ++--
lib/atscppapi/examples/data_caching/Makefile.am | 5 ++---
lib/atscppapi/examples/detachedrequest/Makefile.am | 4 ++--
lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc | 5 +----
lib/atscppapi/examples/globalhook/Makefile.am | 4 ++--
lib/atscppapi/examples/gzip_transformation/Makefile.am | 4 ++--
lib/atscppapi/examples/helloworld/Makefile.am | 4 ++--
.../examples/internal_transaction_handling/Makefile.am | 4 ++--
lib/atscppapi/examples/logger_example/Makefile.am | 4 ++--
lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am | 5 ++---
lib/atscppapi/examples/null_transformation_plugin/Makefile.am | 4 ++--
lib/atscppapi/examples/post_buffer/Makefile.am | 4 ++--
lib/atscppapi/examples/remap_plugin/Makefile.am | 4 ++--
lib/atscppapi/examples/request_cookies/Makefile.am | 5 ++---
lib/atscppapi/examples/serverresponse/Makefile.am | 4 ++--
lib/atscppapi/examples/stat_example/Makefile.am | 4 ++--
lib/atscppapi/examples/timeout_example/Makefile.am | 4 ++--
lib/atscppapi/examples/transactionhook/Makefile.am | 4 ++--
22 files changed, 43 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/async_http_fetch/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/async_http_fetch/Makefile.am b/lib/atscppapi/examples/async_http_fetch/Makefile.am
index dd1dd94..8dbb281 100644
--- a/lib/atscppapi/examples/async_http_fetch/Makefile.am
+++ b/lib/atscppapi/examples/async_http_fetch/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=AsyncHttpFetch.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = AsyncHttpFetch.la
AsyncHttpFetch_la_SOURCES = AsyncHttpFetch.cc
-AsyncHttpFetch_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+AsyncHttpFetch_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/async_timer/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/async_timer/Makefile.am b/lib/atscppapi/examples/async_timer/Makefile.am
index 577d8d7..1a48970 100644
--- a/lib/atscppapi/examples/async_timer/Makefile.am
+++ b/lib/atscppapi/examples/async_timer/Makefile.am
@@ -15,13 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=AsyncTimer.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = AsyncTimer.la
AsyncTimer_la_SOURCES = AsyncTimer.cc
-AsyncTimer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+AsyncTimer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/clientredirect/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/clientredirect/Makefile.am b/lib/atscppapi/examples/clientredirect/Makefile.am
index ec1629c..dde30ef 100644
--- a/lib/atscppapi/examples/clientredirect/Makefile.am
+++ b/lib/atscppapi/examples/clientredirect/Makefile.am
@@ -14,13 +14,12 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=ClientRedirect.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = ClientRedirect.la
ClientRedirect_la_SOURCES = ClientRedirect.cc
-ClientRedirect_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+ClientRedirect_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/clientrequest/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/clientrequest/Makefile.am b/lib/atscppapi/examples/clientrequest/Makefile.am
index 9041577..2c69b0c 100644
--- a/lib/atscppapi/examples/clientrequest/Makefile.am
+++ b/lib/atscppapi/examples/clientrequest/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=ClientRequest.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = ClientRequest.la
ClientRequest_la_SOURCES = ClientRequest.cc
-ClientRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+ClientRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/customresponse/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/customresponse/Makefile.am b/lib/atscppapi/examples/customresponse/Makefile.am
index 1e7093a..8a242a6 100644
--- a/lib/atscppapi/examples/customresponse/Makefile.am
+++ b/lib/atscppapi/examples/customresponse/Makefile.am
@@ -14,13 +14,13 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=CustomResponse.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = CustomResponse.la
CustomResponse_la_SOURCES = CustomResponse.cc
-CustomResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+CustomResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/data_caching/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/data_caching/Makefile.am b/lib/atscppapi/examples/data_caching/Makefile.am
index 818e965..8272e03 100644
--- a/lib/atscppapi/examples/data_caching/Makefile.am
+++ b/lib/atscppapi/examples/data_caching/Makefile.am
@@ -14,13 +14,12 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=data_caching.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = data_caching.la
data_caching_la_SOURCES = data_caching.cc
-data_caching_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+data_caching_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/detachedrequest/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/detachedrequest/Makefile.am b/lib/atscppapi/examples/detachedrequest/Makefile.am
index afe0199..dfda99d 100644
--- a/lib/atscppapi/examples/detachedrequest/Makefile.am
+++ b/lib/atscppapi/examples/detachedrequest/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=DetachedRequest.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = DetachedRequest.la
DetachedRequest_la_SOURCES = DetachedRequest.cc
-DetachedRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+DetachedRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc b/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc
index 68ceebf..629c2e6 100644
--- a/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc
+++ b/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc
@@ -25,10 +25,7 @@ using namespace atscppapi;
class GlobalHookPlugin : public GlobalPlugin {
public:
GlobalHookPlugin() {
- registerHook(HOOK_READ_REQUEST_HEADERS_PRE_REMAP, [](Transaction &t) {
-
- });
-
+ registerHook(HOOK_READ_REQUEST_HEADERS_PRE_REMAP);
}
virtual void handleReadRequestHeadersPreRemap(Transaction &transaction) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/globalhook/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/globalhook/Makefile.am b/lib/atscppapi/examples/globalhook/Makefile.am
index 9269312..71ba649 100644
--- a/lib/atscppapi/examples/globalhook/Makefile.am
+++ b/lib/atscppapi/examples/globalhook/Makefile.am
@@ -14,13 +14,13 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=GlobalHookPlugin.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = GlobalHookPlugin.la
GlobalHookPlugin_la_SOURCES = GlobalHookPlugin.cc
-GlobalHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+GlobalHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/gzip_transformation/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/gzip_transformation/Makefile.am b/lib/atscppapi/examples/gzip_transformation/Makefile.am
index bfaaae1..655c867 100644
--- a/lib/atscppapi/examples/gzip_transformation/Makefile.am
+++ b/lib/atscppapi/examples/gzip_transformation/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=GzipTransformationPlugin.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = GzipTransformationPlugin.la
GzipTransformationPlugin_la_SOURCES = GzipTransformationPlugin.cc
-GzipTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+GzipTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/helloworld/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/helloworld/Makefile.am b/lib/atscppapi/examples/helloworld/Makefile.am
index ebdd7d1..615f3eb 100644
--- a/lib/atscppapi/examples/helloworld/Makefile.am
+++ b/lib/atscppapi/examples/helloworld/Makefile.am
@@ -14,13 +14,13 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=HelloWorldPlugin.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = HelloWorldPlugin.la
HelloWorldPlugin_la_SOURCES = HelloWorldPlugin.cc
-HelloWorldPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+HelloWorldPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
index 447c943..9035fff 100644
--- a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
+++ b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
@@ -14,13 +14,13 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=InternalTransactionHandling.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = InternalTransactionHandling.la
InternalTransactionHandling_la_SOURCES = InternalTransactionHandling.cc
-InternalTransactionHandling_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+InternalTransactionHandling_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/logger_example/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/logger_example/Makefile.am b/lib/atscppapi/examples/logger_example/Makefile.am
index 404dd8c..9b88ed2 100644
--- a/lib/atscppapi/examples/logger_example/Makefile.am
+++ b/lib/atscppapi/examples/logger_example/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=LoggerExample.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = LoggerExample.la
LoggerExample_la_SOURCES = LoggerExample.cc
-LoggerExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+LoggerExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
index d56c921..76f9a66 100644
--- a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
+++ b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
@@ -14,13 +14,12 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=MultipleTransactionHookPlugins.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = MultipleTransactionHookPlugins.la
MultipleTransactionHookPlugins_la_SOURCES = MultipleTransactionHookPlugins.cc
-MultipleTransactionHookPlugins_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+MultipleTransactionHookPlugins_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
index f41c64c..b82f525 100644
--- a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
+++ b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=NullTransformationPlugin.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = NullTransformationPlugin.la
NullTransformationPlugin_la_SOURCES = NullTransformationPlugin.cc
-NullTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+NullTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/post_buffer/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/post_buffer/Makefile.am b/lib/atscppapi/examples/post_buffer/Makefile.am
index e893f5e..fcf20e7 100644
--- a/lib/atscppapi/examples/post_buffer/Makefile.am
+++ b/lib/atscppapi/examples/post_buffer/Makefile.am
@@ -14,13 +14,13 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=PostBuffer.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = PostBuffer.la
PostBuffer_la_SOURCES = PostBuffer.cc
-PostBuffer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+PostBuffer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/remap_plugin/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/remap_plugin/Makefile.am b/lib/atscppapi/examples/remap_plugin/Makefile.am
index 5926f6a..cec18e5 100644
--- a/lib/atscppapi/examples/remap_plugin/Makefile.am
+++ b/lib/atscppapi/examples/remap_plugin/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=RemapPlugin.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = RemapPlugin.la
RemapPlugin_la_SOURCES = RemapPlugin.cc
-RemapPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+RemapPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/request_cookies/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/request_cookies/Makefile.am b/lib/atscppapi/examples/request_cookies/Makefile.am
index dd315cb..03c8040 100644
--- a/lib/atscppapi/examples/request_cookies/Makefile.am
+++ b/lib/atscppapi/examples/request_cookies/Makefile.am
@@ -15,13 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=RequestCookies.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = RequestCookies.la
RequestCookies_la_SOURCES = RequestCookies.cc
-RequestCookies_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+RequestCookies_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/serverresponse/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/serverresponse/Makefile.am b/lib/atscppapi/examples/serverresponse/Makefile.am
index 9f8f4c7..014a65e 100644
--- a/lib/atscppapi/examples/serverresponse/Makefile.am
+++ b/lib/atscppapi/examples/serverresponse/Makefile.am
@@ -14,13 +14,13 @@
# 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.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=ServerResponse.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = ServerResponse.la
ServerResponse_la_SOURCES = ServerResponse.cc
-ServerResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+ServerResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/stat_example/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/stat_example/Makefile.am b/lib/atscppapi/examples/stat_example/Makefile.am
index 3e49f79..29b7caf 100644
--- a/lib/atscppapi/examples/stat_example/Makefile.am
+++ b/lib/atscppapi/examples/stat_example/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=StatExample.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = StatExample.la
StatExample_la_SOURCES = StatExample.cc
-StatExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+StatExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/timeout_example/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/timeout_example/Makefile.am b/lib/atscppapi/examples/timeout_example/Makefile.am
index 7583476..94d6e7b 100644
--- a/lib/atscppapi/examples/timeout_example/Makefile.am
+++ b/lib/atscppapi/examples/timeout_example/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=TimeoutExamplePlugin.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = TimeoutExamplePlugin.la
TimeoutExamplePlugin_la_SOURCES = TimeoutExamplePlugin.cc
-TimeoutExamplePlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+TimeoutExamplePlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9c918b68/lib/atscppapi/examples/transactionhook/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/transactionhook/Makefile.am b/lib/atscppapi/examples/transactionhook/Makefile.am
index 1c145cd..c604875 100644
--- a/lib/atscppapi/examples/transactionhook/Makefile.am
+++ b/lib/atscppapi/examples/transactionhook/Makefile.am
@@ -15,13 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include
target=TransactionHookPlugin.so
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = TransactionHookPlugin.la
TransactionHookPlugin_la_SOURCES = TransactionHookPlugin.cc
-TransactionHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir) -latscppapi
+TransactionHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
all:
ln -sf .libs/$(target)
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e265ff89
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e265ff89
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e265ff89
Branch: refs/heads/master
Commit: e265ff890ad49bd1dd58984fd8ff982125f5487e
Parents: 9c918b6 bb5f909
Author: Brian Geffon <br...@apache.org>
Authored: Tue Oct 22 14:22:21 2013 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Oct 22 14:22:21 2013 -0700
----------------------------------------------------------------------
doc/reference/configuration/records.config.en.rst | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------