[3/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts

[zw...@apache.org]

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/DiagsConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/DiagsConfig.cc b/proxy/shared/DiagsConfig.cc
index 5103f4c..c4da2a8 100644
--- a/proxy/shared/DiagsConfig.cc
+++ b/proxy/shared/DiagsConfig.cc
@@ -21,8 +21,8 @@
   limitations under the License.
  */
 
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
 #include "DiagsConfig.h"
 #include "P_RecCore.h"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/DiagsConfig.h
----------------------------------------------------------------------
diff --git a/proxy/shared/DiagsConfig.h b/proxy/shared/DiagsConfig.h
index ad27d8e..f6ac82c 100644
--- a/proxy/shared/DiagsConfig.h
+++ b/proxy/shared/DiagsConfig.h
@@ -23,7 +23,7 @@
 
 #ifndef __DIAGSCONFIG_H__
 #define __DIAGSCONFIG_H__
-#include "Diags.h"
+#include "ts/Diags.h"
 
 struct DiagsConfig {
   void reconfigure_diags();

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/Error.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/Error.cc b/proxy/shared/Error.cc
index d1c451e..8a72320 100644
--- a/proxy/shared/Error.cc
+++ b/proxy/shared/Error.cc
@@ -32,7 +32,7 @@
 #include "proxy/Main.h"
 #include "Error.h"
 #include <time.h>
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
 
 ErrorClass::~ErrorClass()
 {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/Error.h
----------------------------------------------------------------------
diff --git a/proxy/shared/Error.h b/proxy/shared/Error.h
index 6710c36..8bc7faf 100644
--- a/proxy/shared/Error.h
+++ b/proxy/shared/Error.h
@@ -34,8 +34,8 @@
 #if !defined _Error_h_
 #define _Error_h_
 
-#include "libts.h"
-#include "Diags.h"
+#include "ts/libts.h"
+#include "ts/Diags.h"
 
 //////////////////////////////////////////////////////////////////////////////
 //

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/InkXml.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/InkXml.cc b/proxy/shared/InkXml.cc
index 0f4d1e2..f48e135 100644
--- a/proxy/shared/InkXml.cc
+++ b/proxy/shared/InkXml.cc
@@ -26,7 +26,7 @@
 
 
  ***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
 
 #include "InkXml.h"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/InkXml.h
----------------------------------------------------------------------
diff --git a/proxy/shared/InkXml.h b/proxy/shared/InkXml.h
index 28f494a..ec9c7c8 100644
--- a/proxy/shared/InkXml.h
+++ b/proxy/shared/InkXml.h
@@ -25,7 +25,7 @@
 #ifndef INK_XML_H
 #define INK_XML_H
 
-#include "List.h"
+#include "ts/List.h"
 
 /*-------------------------------------------------------------------------
   InkXml.h

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index f454e23..577f8b3 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -26,8 +26,6 @@ noinst_LIBRARIES = \
 AM_CPPFLAGS = \
   $(iocore_include_dirs) \
   -I$(top_srcdir)/lib/records \
-  -I$(top_srcdir)/lib/ts \
-  -I$(top_builddir)/lib/ts \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/api \
   -I$(top_srcdir)/mgmt/api/include \
@@ -38,8 +36,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/proxy/hdrs \
   -I$(top_srcdir)/proxy/logging \
-  -I$(top_srcdir)/lib \
-  -I$(top_builddir)/lib
+  -I$(top_srcdir)/lib
 
 liberror_a_SOURCES = \
   Error.cc

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/shared/UglyLogStubs.cc
----------------------------------------------------------------------
diff --git a/proxy/shared/UglyLogStubs.cc b/proxy/shared/UglyLogStubs.cc
index 5f8183c..ecb48bc 100644
--- a/proxy/shared/UglyLogStubs.cc
+++ b/proxy/shared/UglyLogStubs.cc
@@ -25,7 +25,7 @@
 // This is total BS, because our libraries are riddled with cross dependencies.
 // TODO: Clean up the dependency mess, and get rid of this.
 
-#include "libts.h"
+#include "ts/libts.h"
 #include "LogObject.h"
 
 #if defined(solaris)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/spdy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/spdy/Makefile.am b/proxy/spdy/Makefile.am
index 01cba4d..d8f7c86 100644
--- a/proxy/spdy/Makefile.am
+++ b/proxy/spdy/Makefile.am
@@ -21,8 +21,6 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/api/ts \
   -I$(top_srcdir)/lib \
   -I$(top_srcdir)/lib/records \
-  -I$(top_srcdir)/lib/ts \
-  -I$(top_builddir)/lib/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/proxy/api \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/test_xml_parser.cc
----------------------------------------------------------------------
diff --git a/proxy/test_xml_parser.cc b/proxy/test_xml_parser.cc
index 7f17d0d..88f362c 100644
--- a/proxy/test_xml_parser.cc
+++ b/proxy/test_xml_parser.cc
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "InkXml.h"
-#include <ink_assert.h>
+#include "ts/ink_assert.h"
 
 int
 main()

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/tools/Makefile.am
----------------------------------------------------------------------
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 91cc72e..1c28af6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,7 +25,6 @@ pkgconfig_DATA = trafficserver.pc
 AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 AM_CPPFLAGS = $(iocore_include_dirs) \
   -I$(top_srcdir)/lib \
-  -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts \
   -I$(top_srcdir)/lib/wccp
 
 if BUILD_TEST_TOOLS

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/tools/http_load/http_load.c
----------------------------------------------------------------------
diff --git a/tools/http_load/http_load.c b/tools/http_load/http_load.c
index c0d1e93..1737d46 100644
--- a/tools/http_load/http_load.c
+++ b/tools/http_load/http_load.c
@@ -25,7 +25,7 @@
 ** SUCH DAMAGE.
 */
 
-#include "ink_config.h"
+#include "ts/ink_config.h"
 
 #include <sys/epoll.h>
 #include <unistd.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/tools/jtest/jtest.cc
----------------------------------------------------------------------
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index f1c38f5..ee276b5 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -51,14 +51,14 @@
 #include <sys/time.h>
 #include <stdlib.h>
 
-#include "ink_defs.h"
-#include "ink_memory.h"
-#include "ink_assert.h"
-#include "INK_MD5.h"
-#include "ParseRules.h"
-#include "ink_time.h"
-#include "ink_args.h"
-#include "I_Version.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_assert.h"
+#include "ts/INK_MD5.h"
+#include "ts/ParseRules.h"
+#include "ts/ink_time.h"
+#include "ts/ink_args.h"
+#include "ts/I_Version.h"
 
 /*
  FTP - Traffic Server Template