From bcb692f33fdc8bfdd75c89f700d4ac3f90f90913 Mon Sep 17 00:00:00 2001 From: Bin Zeng Date: Thu, 23 Apr 2015 11:22:20 -0700 Subject: [PATCH] Fix the header file missing error for out-of-tree build for cppapi. --- .../Makefile.am => build/cppapi-examples.mk | 20 +++-- lib/atscppapi/examples/Makefile.am | 76 +++++++++++++------ .../examples/async_http_fetch/Makefile.am | 30 -------- .../async_http_fetch_streaming/Makefile.am | 30 -------- .../examples/async_timer/Makefile.am | 29 ------- .../examples/clientredirect/Makefile.am | 28 ------- .../examples/clientrequest/Makefile.am | 30 -------- .../examples/customresponse/Makefile.am | 29 ------- lib/atscppapi/examples/globalhook/Makefile.am | 29 ------- .../examples/gzip_transformation/Makefile.am | 30 -------- lib/atscppapi/examples/helloworld/Makefile.am | 29 ------- lib/atscppapi/examples/intercept/Makefile.am | 30 -------- .../internal_transaction_handling/Makefile.am | 29 ------- .../examples/logger_example/Makefile.am | 30 -------- .../multiple_transaction_hooks/Makefile.am | 28 ------- .../null_transformation_plugin/Makefile.am | 30 -------- .../examples/post_buffer/Makefile.am | 29 ------- .../examples/remap_plugin/Makefile.am | 30 -------- .../examples/serverresponse/Makefile.am | 29 ------- .../examples/stat_example/Makefile.am | 30 -------- .../examples/timeout_example/Makefile.am | 30 -------- .../examples/transactionhook/Makefile.am | 30 -------- lib/atscppapi/src/Makefile.am | 4 +- 23 files changed, 65 insertions(+), 624 deletions(-) rename lib/atscppapi/examples/boom/Makefile.am => build/cppapi-examples.mk (73%) delete mode 100644 lib/atscppapi/examples/async_http_fetch/Makefile.am delete mode 100644 lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am delete mode 100644 lib/atscppapi/examples/async_timer/Makefile.am delete mode 100644 lib/atscppapi/examples/clientredirect/Makefile.am delete mode 100644 lib/atscppapi/examples/clientrequest/Makefile.am delete mode 100644 lib/atscppapi/examples/customresponse/Makefile.am delete mode 100644 lib/atscppapi/examples/globalhook/Makefile.am delete mode 100644 lib/atscppapi/examples/gzip_transformation/Makefile.am delete mode 100644 lib/atscppapi/examples/helloworld/Makefile.am delete mode 100644 lib/atscppapi/examples/intercept/Makefile.am delete mode 100644 lib/atscppapi/examples/internal_transaction_handling/Makefile.am delete mode 100644 lib/atscppapi/examples/logger_example/Makefile.am delete mode 100644 lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am delete mode 100644 lib/atscppapi/examples/null_transformation_plugin/Makefile.am delete mode 100644 lib/atscppapi/examples/post_buffer/Makefile.am delete mode 100644 lib/atscppapi/examples/remap_plugin/Makefile.am delete mode 100644 lib/atscppapi/examples/serverresponse/Makefile.am delete mode 100644 lib/atscppapi/examples/stat_example/Makefile.am delete mode 100644 lib/atscppapi/examples/timeout_example/Makefile.am delete mode 100644 lib/atscppapi/examples/transactionhook/Makefile.am diff --git a/lib/atscppapi/examples/boom/Makefile.am b/build/cppapi-examples.mk similarity index 73% rename from lib/atscppapi/examples/boom/Makefile.am rename to build/cppapi-examples.mk index 882f6a7f4d8..4b9660d26c8 100644 --- a/lib/atscppapi/examples/boom/Makefile.am +++ b/build/cppapi-examples.mk @@ -1,4 +1,3 @@ -# # 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 @@ -14,15 +13,14 @@ # 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)/lib/atscppapi/src/include -Wno-unused-variable -target=boom.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = boom.la -boom_la_SOURCES = boom.cc -boom_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi -all: - ln -sf .libs/$(target) +# atscppapi-examples.mk: Common automake build variables for atscppapi plugin examples. + +TS_PLUGIN_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable + +LDADD = libatscppapi.la +TS_PLUGIN_LDFLAGS = -module -avoid-version -shared + +AM_CPPFLAGS = $(TS_PLUGIN_CPPFLAGS) +pkglibdir = ${pkglibexecdir} -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/Makefile.am b/lib/atscppapi/examples/Makefile.am index 9f56838cf5d..2e1d551a44f 100644 --- a/lib/atscppapi/examples/Makefile.am +++ b/lib/atscppapi/examples/Makefile.am @@ -15,25 +15,57 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = \ - helloworld \ - globalhook \ - transactionhook \ - multiple_transaction_hooks \ - clientrequest \ - serverresponse \ - clientredirect \ - customresponse \ - null_transformation_plugin \ - post_buffer \ - logger_example \ - boom \ - stat_example \ - remap_plugin \ - async_http_fetch \ - gzip_transformation \ - timeout_example \ - internal_transaction_handling \ - async_timer \ - intercept \ - async_http_fetch_streaming +include $(top_srcdir)/build/cppapi-examples.mk + +AM_LDFLAGS = $(TS_PLUGIN_LDFLAGS) + +plugins = \ + async_http_fetch.la \ + async_http_fetch_streaming.la \ + async_timer.la \ + boom.la \ + clientredirect.la \ + clientrequest.la \ + customresponse.la \ + globalhook.la \ + gzip_transformation.la \ + helloworld.la \ + intercept.la \ + internal_transaction_handling.la \ + logger_example.la \ + multiple_transaction_hooks.la \ + null_transformation_plugin.la \ + post_buffer.la \ + remap_plugin.la \ + serverresponse.la \ + stat_example.la \ + timeout_example.la \ + transactionhook.la + +if BUILD_EXAMPLE_PLUGINS +pkglib_LTLIBRARIES = $(plugins) +else +noinst_LTLIBRARIES = $(plugins) +endif + +async_http_fetch_la_SOURCES = async_http_fetch/AsyncHttpFetch.cc +async_http_fetch_streaming_la_SOURCES = async_http_fetch_streaming/AsyncHttpFetchStreaming.cc +async_timer_la_SOURCES = async_timer/AsyncTimer.cc +boom_la_SOURCES = boom/boom.cc +clientredirect_la_SOURCES = clientredirect/ClientRedirect.cc +clientrequest_la_SOURCES = clientrequest/ClientRequest.cc +customresponse_la_SOURCES = customresponse/CustomResponse.cc +globalhook_la_SOURCES = globalhook/GlobalHookPlugin.cc +gzip_transformation_la_SOURCES = gzip_transformation/GzipTransformationPlugin.cc +helloworld_la_SOURCES = helloworld/HelloWorldPlugin.cc +intercept_la_SOURCES = intercept/intercept.cc +internal_transaction_handling_la_SOURCES = internal_transaction_handling/InternalTransactionHandling.cc +logger_example_la_SOURCES = logger_example/LoggerExample.cc +multiple_transaction_hooks_la_SOURCES = multiple_transaction_hooks/MultipleTransactionHookPlugins.cc +null_transformation_plugin_la_SOURCES = null_transformation_plugin/NullTransformationPlugin.cc +post_buffer_la_SOURCES = post_buffer/PostBuffer.cc +remap_plugin_la_SOURCES = remap_plugin/RemapPlugin.cc +serverresponse_la_SOURCES = serverresponse/ServerResponse.cc +stat_example_la_SOURCES = stat_example/StatExample.cc +timeout_example_la_SOURCES = timeout_example/TimeoutExamplePlugin.cc +transactionhook_la_SOURCES = transactionhook/TransactionHookPlugin.cc diff --git a/lib/atscppapi/examples/async_http_fetch/Makefile.am b/lib/atscppapi/examples/async_http_fetch/Makefile.am deleted file mode 100644 index dd7922797a3..00000000000 --- a/lib/atscppapi/examples/async_http_fetch/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=AsyncHttpFetch.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = AsyncHttpFetch.la -AsyncHttpFetch_la_SOURCES = AsyncHttpFetch.cc -AsyncHttpFetch_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am b/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am deleted file mode 100644 index ecc204a8c5c..00000000000 --- a/lib/atscppapi/examples/async_http_fetch_streaming/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=AsyncHttpFetchStreaming.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = AsyncHttpFetchStreaming.la -AsyncHttpFetchStreaming_la_SOURCES = AsyncHttpFetchStreaming.cc -AsyncHttpFetchStreaming_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/async_timer/Makefile.am b/lib/atscppapi/examples/async_timer/Makefile.am deleted file mode 100644 index 363e93acd54..00000000000 --- a/lib/atscppapi/examples/async_timer/Makefile.am +++ /dev/null @@ -1,29 +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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable -target=AsyncTimer.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = AsyncTimer.la -AsyncTimer_la_SOURCES = AsyncTimer.cc -AsyncTimer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/clientredirect/Makefile.am b/lib/atscppapi/examples/clientredirect/Makefile.am deleted file mode 100644 index 6c68195c401..00000000000 --- a/lib/atscppapi/examples/clientredirect/Makefile.am +++ /dev/null @@ -1,28 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable -target=ClientRedirect.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = ClientRedirect.la -ClientRedirect_la_SOURCES = ClientRedirect.cc -ClientRedirect_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/clientrequest/Makefile.am b/lib/atscppapi/examples/clientrequest/Makefile.am deleted file mode 100644 index 452c1c0517c..00000000000 --- a/lib/atscppapi/examples/clientrequest/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=ClientRequest.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = ClientRequest.la -ClientRequest_la_SOURCES = ClientRequest.cc -ClientRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/customresponse/Makefile.am b/lib/atscppapi/examples/customresponse/Makefile.am deleted file mode 100644 index 5b850fdd468..00000000000 --- a/lib/atscppapi/examples/customresponse/Makefile.am +++ /dev/null @@ -1,29 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=CustomResponse.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = CustomResponse.la -CustomResponse_la_SOURCES = CustomResponse.cc -CustomResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/globalhook/Makefile.am b/lib/atscppapi/examples/globalhook/Makefile.am deleted file mode 100644 index a9b301af905..00000000000 --- a/lib/atscppapi/examples/globalhook/Makefile.am +++ /dev/null @@ -1,29 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=GlobalHookPlugin.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = GlobalHookPlugin.la -GlobalHookPlugin_la_SOURCES = GlobalHookPlugin.cc -GlobalHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/gzip_transformation/Makefile.am b/lib/atscppapi/examples/gzip_transformation/Makefile.am deleted file mode 100644 index 98dd8cd7d48..00000000000 --- a/lib/atscppapi/examples/gzip_transformation/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=GzipTransformationPlugin.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = GzipTransformationPlugin.la -GzipTransformationPlugin_la_SOURCES = GzipTransformationPlugin.cc -GzipTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/helloworld/Makefile.am b/lib/atscppapi/examples/helloworld/Makefile.am deleted file mode 100644 index 9bb13dfbfb0..00000000000 --- a/lib/atscppapi/examples/helloworld/Makefile.am +++ /dev/null @@ -1,29 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=HelloWorldPlugin.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = HelloWorldPlugin.la -HelloWorldPlugin_la_SOURCES = HelloWorldPlugin.cc -HelloWorldPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/intercept/Makefile.am b/lib/atscppapi/examples/intercept/Makefile.am deleted file mode 100644 index 44a4d875b39..00000000000 --- a/lib/atscppapi/examples/intercept/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. -# -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=intercept.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = intercept.la -intercept_la_SOURCES = intercept.cc -intercept_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am deleted file mode 100644 index a521c2194a8..00000000000 --- a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am +++ /dev/null @@ -1,29 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=InternalTransactionHandling.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = InternalTransactionHandling.la -InternalTransactionHandling_la_SOURCES = InternalTransactionHandling.cc -InternalTransactionHandling_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/logger_example/Makefile.am b/lib/atscppapi/examples/logger_example/Makefile.am deleted file mode 100644 index 892b57fcff2..00000000000 --- a/lib/atscppapi/examples/logger_example/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=LoggerExample.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = LoggerExample.la -LoggerExample_la_SOURCES = LoggerExample.cc -LoggerExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am deleted file mode 100644 index 5ff7df4dab1..00000000000 --- a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am +++ /dev/null @@ -1,28 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable -target=MultipleTransactionHookPlugins.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = MultipleTransactionHookPlugins.la -MultipleTransactionHookPlugins_la_SOURCES = MultipleTransactionHookPlugins.cc -MultipleTransactionHookPlugins_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am deleted file mode 100644 index 7c196da4f8f..00000000000 --- a/lib/atscppapi/examples/null_transformation_plugin/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=NullTransformationPlugin.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = NullTransformationPlugin.la -NullTransformationPlugin_la_SOURCES = NullTransformationPlugin.cc -NullTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/post_buffer/Makefile.am b/lib/atscppapi/examples/post_buffer/Makefile.am deleted file mode 100644 index 6829ad3c0d9..00000000000 --- a/lib/atscppapi/examples/post_buffer/Makefile.am +++ /dev/null @@ -1,29 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=PostBuffer.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = PostBuffer.la -PostBuffer_la_SOURCES = PostBuffer.cc -PostBuffer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/remap_plugin/Makefile.am b/lib/atscppapi/examples/remap_plugin/Makefile.am deleted file mode 100644 index ec166a4a70a..00000000000 --- a/lib/atscppapi/examples/remap_plugin/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=RemapPlugin.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = RemapPlugin.la -RemapPlugin_la_SOURCES = RemapPlugin.cc -RemapPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/serverresponse/Makefile.am b/lib/atscppapi/examples/serverresponse/Makefile.am deleted file mode 100644 index 56cab1e1125..00000000000 --- a/lib/atscppapi/examples/serverresponse/Makefile.am +++ /dev/null @@ -1,29 +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. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=ServerResponse.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = ServerResponse.la -ServerResponse_la_SOURCES = ServerResponse.cc -ServerResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/stat_example/Makefile.am b/lib/atscppapi/examples/stat_example/Makefile.am deleted file mode 100644 index 6e95a5ea527..00000000000 --- a/lib/atscppapi/examples/stat_example/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=StatExample.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = StatExample.la -StatExample_la_SOURCES = StatExample.cc -StatExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/timeout_example/Makefile.am b/lib/atscppapi/examples/timeout_example/Makefile.am deleted file mode 100644 index 2c8ae0532b2..00000000000 --- a/lib/atscppapi/examples/timeout_example/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=TimeoutExamplePlugin.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = TimeoutExamplePlugin.la -TimeoutExamplePlugin_la_SOURCES = TimeoutExamplePlugin.cc -TimeoutExamplePlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/examples/transactionhook/Makefile.am b/lib/atscppapi/examples/transactionhook/Makefile.am deleted file mode 100644 index 08f240620f9..00000000000 --- a/lib/atscppapi/examples/transactionhook/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. - -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable - -target=TransactionHookPlugin.so -pkglibdir = ${pkglibexecdir} -pkglib_LTLIBRARIES = TransactionHookPlugin.la -TransactionHookPlugin_la_SOURCES = TransactionHookPlugin.cc -TransactionHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi - -all: - ln -sf .libs/$(target) - -clean-local: - rm -f $(target) diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am index 2f2aad562c4..aaaf481d0f2 100644 --- a/lib/atscppapi/src/Makefile.am +++ b/lib/atscppapi/src/Makefile.am @@ -20,7 +20,7 @@ TS_PLUGIN_CPPFLAGS = \ -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/lib/ts -AM_CXXFLAGS = -Iinclude $(TS_PLUGIN_CPPFLAGS) +AM_CXXFLAGS = -Iinclude $(TS_PLUGIN_CPPFLAGS) -I$(srcdir)/include # build the library lib_LTLIBRARIES = libatscppapi.la @@ -51,7 +51,7 @@ libatscppapi_la_SOURCES = GlobalPlugin.cc \ InterceptPlugin.cc library_includedir=$(includedir)/atscppapi -base_include_folder = include/atscppapi/ +base_include_folder = $(srcdir)/include/atscppapi/ library_include_HEADERS = $(base_include_folder)/GlobalPlugin.h \ $(base_include_folder)/Plugin.h \