Updated Branches: refs/heads/master 3775c866c -> 199b6b846
Fixing build for os x Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e6e999e7 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e6e999e7 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e6e999e7 Branch: refs/heads/master Commit: e6e999e782f0b8c43deafb0befbfabe324670f9f Parents: 1f829e2 Author: Brian Geffon <[email protected]> Authored: Mon Oct 21 17:55:53 2013 -0700 Committer: Brian Geffon <[email protected]> Committed: Mon Oct 21 17:55:53 2013 -0700 ---------------------------------------------------------------------- lib/atscppapi/Makefile.am | 1 - lib/atscppapi/src/Makefile.am | 14 +++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6e999e7/lib/atscppapi/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/Makefile.am b/lib/atscppapi/Makefile.am index 028d09c..166edb9 100644 --- a/lib/atscppapi/Makefile.am +++ b/lib/atscppapi/Makefile.am @@ -14,6 +14,5 @@ # 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. -includedir=$(prefix)/include/ts SUBDIRS = src http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6e999e7/lib/atscppapi/src/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am index 52085d0..4e7d204 100644 --- a/lib/atscppapi/src/Makefile.am +++ b/lib/atscppapi/src/Makefile.am @@ -15,11 +15,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CXXFLAGS = -Iinclude +TS_PLUGIN_CPPFLAGS = \ + -D__STDC_LIMIT_MACROS=1 \ + -D__STDC_FORMAT_MACROS=1 \ + -I$(top_builddir)/proxy/api \ + -I$(top_srcdir)/proxy/api \ + -I$(top_builddir)/lib/ts \ + -I$(top_srcdir)/lib/ts + +AM_CXXFLAGS = -Iinclude $(TS_PLUGIN_CPPFLAGS) # build the library lib_LTLIBRARIES = libatscppapi.la -libatscppapi_la_LDFLAGS=-lz -lpthread -lrt -version-info @TS_LIBTOOL_VERSION@ +libatscppapi_la_LDFLAGS=-lz -lpthread -version-info @TS_LIBTOOL_VERSION@ libatscppapi_la_SOURCES = GlobalPlugin.cc \ Plugin.cc \ @@ -74,4 +82,4 @@ library_include_HEADERS = $(base_include_folder)/GlobalPlugin.h \ $(base_include_folder)/AsyncHttpFetch.h \ $(base_include_folder)/GzipDeflateTransformation.h \ $(base_include_folder)/GzipInflateTransformation.h \ - $(base_include_folder)/AsyncTimer.h \ No newline at end of file + $(base_include_folder)/AsyncTimer.h
