trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject git commit: TS-2612 Fix building out of source tree, and a few other build errors
Date Wed, 12 Mar 2014 16:07:19 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master f914a62fc -> 628dad955


TS-2612 Fix building out of source tree, and a few other build errors


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

Branch: refs/heads/master
Commit: 628dad9551ed7eb9617572a8dae17465fc2a797d
Parents: f914a62
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Wed Mar 12 10:07:12 2014 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Wed Mar 12 10:07:12 2014 -0600

----------------------------------------------------------------------
 iocore/aio/Makefile.am         | 1 +
 iocore/cache/Makefile.am       | 1 +
 iocore/cluster/Makefile.am     | 1 +
 iocore/dns/Makefile.am         | 1 +
 iocore/eventsystem/Makefile.am | 1 +
 iocore/hostdb/Makefile.am      | 1 +
 iocore/net/Makefile.am         | 1 +
 lib/wccp/Makefile.am           | 4 ++--
 mgmt/Makefile.am               | 1 +
 proxy/FetchSM.cc               | 2 +-
 proxy/InkAPIInternal.h         | 6 +++---
 proxy/Makefile.am              | 1 +
 proxy/congest/Makefile.am      | 1 +
 proxy/http/Makefile.am         | 1 +
 proxy/http/remap/Makefile.am   | 1 +
 proxy/logging/Makefile.am      | 1 +
 proxy/shared/Makefile.am       | 3 +--
 17 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/iocore/aio/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index d270520..20c619d 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -39,6 +39,7 @@ test_AIO_SOURCES = \
 test_AIO_CXXFLAGS = \
   $(iocore_include_dirs) \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy/api \
   -I$(top_srcdir)/proxy \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/iocore/cache/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 1ef08a6..2419ca0 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/records \
   -I$(top_srcdir)/lib/ts \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/hdrs \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/iocore/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am
index 7a09cf7..7c5204a 100644
--- a/iocore/cluster/Makefile.am
+++ b/iocore/cluster/Makefile.am
@@ -24,6 +24,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/proxy/hdrs \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/mgmt \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/iocore/dns/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index 4a97003..91de208 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/api/ts \
+  -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/proxy/hdrs \
   -I$(top_srcdir)/mgmt \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/iocore/eventsystem/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 7d43def..a1caa3c 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -74,6 +74,7 @@ check_PROGRAMS = test_Buffer test_Event
 test_CXXFLAGS = \
   $(iocore_include_dirs) \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy/api \
   -I$(top_srcdir)/proxy \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/iocore/hostdb/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index 3f07b34..b84220c 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/api/ts \
+  -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy/hdrs \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/mgmt \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/iocore/net/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index 8c31944..66eb680 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/api/ts \
+  -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy/hdrs \
   -I$(top_srcdir)/proxy/shared \
   -I$(top_srcdir)/mgmt \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/lib/wccp/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/wccp/Makefile.am b/lib/wccp/Makefile.am
index 7b01eec..0f53fcd 100644
--- a/lib/wccp/Makefile.am
+++ b/lib/wccp/Makefile.am
@@ -20,8 +20,8 @@
 AM_CPPFLAGS = \
   -I$(top_srcdir)/lib \
   -I$(top_srcdir)/lib/ts \
-  -I$(top_builddir)/proxy/api/ts \
-  -I$(top_srcdir)/proxy/api/ts
+  -I$(top_srcdir)/proxy/api/ts \
+  -I$(top_builddir)/proxy/api/ts
 
 #WCCP_DEFS = @WCCP_DEFS@
 #DEFS += $(WCCP_DEFS)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index db485c8..55c105a 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -52,6 +52,7 @@ libmgmt_p_a_CPPFLAGS = \
   -I$(top_srcdir)/mgmt/utils \
   -I$(top_srcdir)/mgmt/web2 \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/hdrs \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/FetchSM.cc
----------------------------------------------------------------------
diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc
index 2d24149..351831f 100644
--- a/proxy/FetchSM.cc
+++ b/proxy/FetchSM.cc
@@ -376,7 +376,7 @@ FetchSM::process_fetch_read(int event)
   switch (event) {
   case TS_EVENT_VCONN_READ_READY:
     bytes = resp_reader->read_avail();
-    Debug(DEBUG_TAG, "[%s] number of bytes in read ready %"PRId64"", __FUNCTION__, bytes);
+    Debug(DEBUG_TAG, "[%s] number of bytes in read ready %" PRId64, __FUNCTION__, bytes);
     if (header_done == 0 && ((fetch_flags & TS_FETCH_FLAGS_STREAM) || callback_options
== AFTER_HEADER)) {
       if (client_response_hdr.parse_resp(&http_parser, resp_reader, &bytes_used,
0) == PARSE_DONE) {
         header_done = 1;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/InkAPIInternal.h
----------------------------------------------------------------------
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index 74614df..2d7aaaf 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -28,9 +28,9 @@
 #include "URL.h"
 #include "StatSystem.h"
 #include "P_Net.h"
-#include "api/ts/ts.h"
-#include "api/ts/experimental.h"
-#include "api/ts/InkAPIPrivateIOCore.h"
+#include "ts.h"
+#include "experimental.h"
+#include "InkAPIPrivateIOCore.h"
 #include "HTTP.h"
 #include "List.h"
 #include "ProxyConfig.h"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 88f8d54..46b9247 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -45,6 +45,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/preparse \
   -I$(top_srcdir)/mgmt/utils \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/lib
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/congest/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index ae1d3dc..d89d136 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/api/ts \
+  -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/preparse \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/http/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 3d48cee..0f7646a 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -21,6 +21,7 @@ SUBDIRS = remap
 AM_CPPFLAGS = \
   $(iocore_include_dirs) \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/lib \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/http/remap/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 29781ee..8dd3d38 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/records \
   -I$(top_srcdir)/lib/ts \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/mgmt \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/logging/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index 6014bb4..dfa45be 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/lib/records \
   -I$(top_srcdir)/lib/ts \
   -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/http \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/628dad95/proxy/shared/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index d3fafb7..92b72af 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -36,12 +36,11 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/mgmt/preparse \
   -I$(top_srcdir)/mgmt/utils \
   -I$(top_srcdir) \
-  -I$(top_builddir)/proxy \
+  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_builddir)/proxy/api/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/proxy/hdrs \
-  -I$(top_srcdir)/proxy/api/ts \
   -I$(top_srcdir)/proxy/logging \
   -I$(top_srcdir)/lib
 


Mime
View raw message