You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/12/02 16:37:26 UTC

svn commit: r1041414 - in /trafficserver/traffic/trunk: ./ ci/ doc/ example/app-template/ iocore/block-cache/ iocore/eventsystem/ lib/ lib/ts/ libinktomi++/ proxy/ proxy/hdrs/ proxy/mgmt2/ proxy/mgmt2/api2/remote/ proxy/mgmt2/cli/ proxy/mgmt2/cli2/ pro...

Author: zwoop
Date: Thu Dec  2 15:37:24 2010
New Revision: 1041414

URL: http://svn.apache.org/viewvc?rev=1041414&view=rev
Log:
TS-571 Rename libinktomi++ to lib/ts.

Added:
    trafficserver/traffic/trunk/lib/ts/
      - copied from r1041399, trafficserver/traffic/trunk/libinktomi++/
Removed:
    trafficserver/traffic/trunk/libinktomi++/
Modified:
    trafficserver/traffic/trunk/.gitignore
    trafficserver/traffic/trunk/Makefile.am
    trafficserver/traffic/trunk/README
    trafficserver/traffic/trunk/REVIEWERS
    trafficserver/traffic/trunk/ci/rat-excludes.txt
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/doc/Doxyfile.in
    trafficserver/traffic/trunk/example/app-template/Makefile.am
    trafficserver/traffic/trunk/iocore/block-cache/P_BlockCacheKey.h
    trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
    trafficserver/traffic/trunk/lib/Makefile.am
    trafficserver/traffic/trunk/lib/ts/Makefile.am
    trafficserver/traffic/trunk/lib/ts/RawHashTable.cc
    trafficserver/traffic/trunk/lib/ts/RawHashTable.h
    trafficserver/traffic/trunk/lib/ts/ink_error.h
    trafficserver/traffic/trunk/lib/ts/ink_file.cc
    trafficserver/traffic/trunk/lib/ts/ink_file.h
    trafficserver/traffic/trunk/lib/ts/ink_memory.cc
    trafficserver/traffic/trunk/lib/ts/ink_memory.h
    trafficserver/traffic/trunk/lib/ts/ink_string.cc
    trafficserver/traffic/trunk/lib/ts/ink_string.h
    trafficserver/traffic/trunk/lib/ts/ink_time.cc
    trafficserver/traffic/trunk/lib/ts/ink_time.h
    trafficserver/traffic/trunk/lib/ts/inktomi++.h
    trafficserver/traffic/trunk/lib/ts/test_atomic.cc
    trafficserver/traffic/trunk/proxy/Makefile.am
    trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
    trafficserver/traffic/trunk/proxy/issues.txt
    trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am
    trafficserver/traffic/trunk/rc/Makefile.am
    trafficserver/traffic/trunk/test/deft/Makefile.am
    trafficserver/traffic/trunk/test/deft/proc_manager.cc
    trafficserver/traffic/trunk/test/deft/test_exec.cc
    trafficserver/traffic/trunk/test/plugin/INKAction/Makefile.am
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/Makefile.am

Modified: trafficserver/traffic/trunk/.gitignore
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/.gitignore?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/.gitignore (original)
+++ trafficserver/traffic/trunk/.gitignore Thu Dec  2 15:37:24 2010
@@ -33,14 +33,14 @@ doc/Doxyfile
 doc/html/
 doc/warn.log
 
-libinktomi++/ink_autoconf.h
-libinktomi++/ink_config.h
-libinktomi++/stamp-h1
-libinktomi++/CompileParseRules
-libinktomi++/ParseRulesCType
-libinktomi++/ParseRulesCTypeToLower
-libinktomi++/ParseRulesCTypeToUpper
-libinktomi++/mkdfa
+lib/ts/ink_autoconf.h
+lib/ts/ink_config.h
+lib/ts/stamp-h1
+lib/ts/CompileParseRules
+lib/ts/ParseRulesCType
+lib/ts/ParseRulesCTypeToLower
+lib/ts/ParseRulesCTypeToUpper
+lib/ts/mkdfa
 proxy/config/records.config
 proxy/config/storage.config
 

Modified: trafficserver/traffic/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/Makefile.am (original)
+++ trafficserver/traffic/trunk/Makefile.am Thu Dec  2 15:37:24 2010
@@ -22,9 +22,9 @@
 ACLOCAL_AMFLAGS = -I build
 
 if STANDALONE_IOCORE
-SUBDIRS =  libinktomi++ librecords iocore lib @hdr_dirs@ proxy
+SUBDIRS =  librecords iocore lib @hdr_dirs@ proxy
 else
-SUBDIRS =  libinktomi++ librecords iocore lib proxy doc rc
+SUBDIRS =  librecords iocore lib proxy doc rc
 endif
 
 DIST_BUILD_USER=`id -nu`

Modified: trafficserver/traffic/trunk/README
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/README?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/README (original)
+++ trafficserver/traffic/trunk/README Thu Dec  2 15:37:24 2010
@@ -11,7 +11,9 @@ plugins to build large scale web applica
   |-- example/ ........... example plugins
   |-- install/ ........... installation programs and scripts
   |-- iocore/ ............ IO core
-  |-- libinktomi++/ ...... base library
+  |-- lib ................ 
+      |-- ts ............. Base / core library
+      |-- tsconfig........ New config parser and library (experimental)
   |-- librecords/ ........ library for config files
   |-- m4/ ................ custom macros for configure.ac
   |-- proxy/ ............. HTTP proxy logic

Modified: trafficserver/traffic/trunk/REVIEWERS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/REVIEWERS?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/REVIEWERS (original)
+++ trafficserver/traffic/trunk/REVIEWERS Thu Dec  2 15:37:24 2010
@@ -21,7 +21,7 @@ all/general interest
         mturk@apache.org
         zwoop@apache.org
         jim@apache.org
-libinktomi++
+lib/ts
         jplevyak@apache.org
         zwoop@apache.org
         bcall@apache.org
@@ -35,6 +35,7 @@ Network I/O
         bcall@apache.org
         georgep@apache.org
         jim@apache.org
+	zwoop@apache.org
 Raw Cache and AIO
         jplevyak@apache.org
         bcall@apache.org
@@ -42,8 +43,7 @@ Raw Cache and AIO
 HTTP Caching
         bcall@apache.org
         jim@apache.org
-Pluggable Cache/NewCacheVC
-        bcall@apache.org
+	zwoop@apache.org
 Block-Cache
 Clustering
         jplevyak@apache.org
@@ -63,8 +63,10 @@ Examples/Plugins
 librecords
         bcall@apache.org
         georgep@apache.org
+	zwoop@apache.org
 HDRs
         bcall@apache.org
+	zwoop@apache.org
 HTTP
         bcall@apache.org
         zwoop@apache.org
@@ -89,6 +91,7 @@ MGMT
 Stats
         bcall@apache.org
         georgep@apache.org
+	zwoop@apache.org
 Build System
         zwoop@apache.org
         bcall@apache.org

Modified: trafficserver/traffic/trunk/ci/rat-excludes.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/ci/rat-excludes.txt?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/ci/rat-excludes.txt (original)
+++ trafficserver/traffic/trunk/ci/rat-excludes.txt Thu Dec  2 15:37:24 2010
@@ -59,12 +59,12 @@ test/SDKtest/client/thinktime.slow
 doc/dot/
 doc/Doxyfile
 doc/Doxyfile.in
-libinktomi++/ParseRulesCType
-libinktomi++/ParseRulesCTypeToLower
-libinktomi++/ParseRulesCTypeToUpper
-libinktomi++/fastlz.h
-libinktomi++/fastlz.c
-libinktomi++/stamp-h1
+lib/ts/ParseRulesCType
+lib/ts/ParseRulesCTypeToLower
+lib/ts/ParseRulesCTypeToUpper
+lib/ts/fastlz.h
+lib/ts/fastlz.c
+lib/ts/stamp-h1
 iocore/aio/sample.cfg
 iocore/cache/Notes
 iocore/cache/cache_test.config
@@ -80,10 +80,10 @@ test/deft/defs/localhost.def
 test/plugin/INKHttpHooksTrans/altSelect.notes
 proxy/mgmt2/html2/tune/navigation_tree.xml
 proxy/mgmt2/cli2/hashtable.cc
-libinktomi++/ink_res_init.cc
-libinktomi++/ink_res_mkquery.cc
-libinktomi++/ink_rand.h
-libinktomi++/ink_rand.cc
+lib/ts/ink_res_init.cc
+lib/ts/ink_res_mkquery.cc
+lib/ts/ink_rand.h
+lib/ts/ink_rand.cc
 README.libev
 README-EC2
 REVIEWERS

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Thu Dec  2 15:37:24 2010
@@ -41,7 +41,7 @@ AC_CONFIG_AUX_DIR([build/aux])
 AC_CONFIG_SRCDIR([proxy/Main.cc])
 AC_CONFIG_MACRO_DIR([build])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign no-installinfo no-installman 1.9.2])
-AM_CONFIG_HEADER([libinktomi++/ink_autoconf.h])
+AM_CONFIG_HEADER([lib/ts/ink_autoconf.h])
 
 # Libtool versioning uses different conventions on different
 # platforms.  At least on FreeBSD, libtool uses an overly complex
@@ -916,7 +916,7 @@ AC_SUBST(has_profiler)
 
 has_demangle=0
 # For SunPro 5.2 - we need the demangle symbol for
-#  ink_stack_trace.cc in libinktomi++.  Because this
+#  ink_stack_trace.cc in lib/ts.  Because this
 #  library is part of the SunPro distribution, we need
 #  check with the C++ compiler since we might be using
 #  SunPro CC for the C++ compiler and gcc for the C compiler
@@ -1217,7 +1217,7 @@ AC_SUBST([TFW_PACKAGE_SUFFIX])
 # -----------------------------------------------------------------------------
 # 6. OUTPUT FILES
 
-AC_CONFIG_FILES([libinktomi++/ink_config.h proxy/api/ts/ts.h])
+AC_CONFIG_FILES([lib/ts/ink_config.h proxy/api/ts/ts.h])
 AC_CONFIG_FILES([tsxs])
 AC_CONFIG_FILES([doc/Doxyfile])
 AC_CONFIG_FILES([doc/Makefile])
@@ -1232,7 +1232,7 @@ AC_CONFIG_FILES([iocore/hostdb/Makefile]
 AC_CONFIG_FILES([iocore/Makefile])
 AC_CONFIG_FILES([iocore/net/Makefile])
 AC_CONFIG_FILES([iocore/utils/Makefile])
-AC_CONFIG_FILES([libinktomi++/Makefile])
+AC_CONFIG_FILES([lib/ts/Makefile])
 AC_CONFIG_FILES([librecords/Makefile])
 AC_CONFIG_FILES([lib/Makefile])
 AC_CONFIG_FILES([lib/tsconfig/Makefile])

Modified: trafficserver/traffic/trunk/doc/Doxyfile.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/doc/Doxyfile.in?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/doc/Doxyfile.in (original)
+++ trafficserver/traffic/trunk/doc/Doxyfile.in Thu Dec  2 15:37:24 2010
@@ -475,7 +475,7 @@ WARN_LOGFILE           = warn.log
 
 INPUT                  = @abs_top_srcdir@/doc/mainpage.doc \
                          @abs_top_srcdir@/iocore \
-                         @abs_top_srcdir@/libinktomi++ \
+                         @abs_top_srcdir@/lib/ts \
                          @abs_top_srcdir@/librecords \
                          @abs_top_srcdir@/proxy \
                          @abs_top_srcdir@/test

Modified: trafficserver/traffic/trunk/example/app-template/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/app-template/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/app-template/Makefile.am (original)
+++ trafficserver/traffic/trunk/example/app-template/Makefile.am Thu Dec  2 15:37:24 2010
@@ -39,7 +39,7 @@ tsapp_LDADD =  \
         $(top_builddir)/iocore/utils/libinkutils.a \
         $(top_builddir)/iocore/eventsystem/libinkevent.a \
         $(top_builddir)/librecords/librecprocess.a \
-        $(top_builddir)/libinktomi++/libinktomi++.a \
+        $(top_builddir)/lib/ts/libts.a \
 	  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
 	  @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
 	  @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ \

Modified: trafficserver/traffic/trunk/iocore/block-cache/P_BlockCacheKey.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/block-cache/P_BlockCacheKey.h?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/block-cache/P_BlockCacheKey.h (original)
+++ trafficserver/traffic/trunk/iocore/block-cache/P_BlockCacheKey.h Thu Dec  2 15:37:24 2010
@@ -59,7 +59,7 @@ private:
      Note the positive implications of using INK_MD5 * instead of
      INK_MD5 directly.
      The implementation (or anyone who includes this header file) is
-     now not forced to be coupled to the libinktomi library headers
+     now not forced to be coupled to the libts library headers
      (and transitively potentially coupled to any headers that it is
      dependent on...).
   */

Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h Thu Dec  2 15:37:24 2010
@@ -146,7 +146,7 @@ class EThread;
 
   The schedulling functions use a time parameter typed as ink_hrtime
   for specifying the timeouts or periods. This is a nanosecond value
-  supported by libinktomi and you should use the time functions and
+  supported by libts and you should use the time functions and
   macros defined in ink_hrtime.h.
 
   The difference between the timeout specified for schedule_at and

Modified: trafficserver/traffic/trunk/lib/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/Makefile.am (original)
+++ trafficserver/traffic/trunk/lib/Makefile.am Thu Dec  2 15:37:24 2010
@@ -16,7 +16,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+SUBDIRS = ts
+
 # TsConfig is only built for WCCP until the bugs are worked out.
 if BUILD_WCCP
-SUBDIRS = tsconfig
+SUBDIRS += tsconfig
 endif

Modified: trafficserver/traffic/trunk/lib/ts/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Makefile.am?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Makefile.am (original)
+++ trafficserver/traffic/trunk/lib/ts/Makefile.am Thu Dec  2 15:37:24 2010
@@ -1,4 +1,4 @@
-# libinktomi++ Makefile.am
+# libts Makefile.am
 #
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
@@ -19,10 +19,10 @@
 noinst_PROGRAMS = mkdfa CompileParseRules
 check_PROGRAMS = test_atomic test_freelist test_arena test_List
 TESTS = $(check_PROGRAMS)
-noinst_LIBRARIES = libinktomi++.a
+noinst_LIBRARIES = libts.a
 
-#libinktomi___a_CCASFLAGS = -Wa,-32
-libinktomi___a_SOURCES = \
+#libts_a_CCASFLAGS = -Wa,-32
+libts_a_SOURCES = \
   Allocator.cc \
   Allocator.h \
   Arena.cc \
@@ -144,23 +144,23 @@ libinktomi___a_SOURCES = \
 if SUPPORT_ATOMICS
 # support in header
 else
-libinktomi___a_SOURCES += ink_atomic_solaris_i86pc.s
+libts_a_SOURCES += ink_atomic_solaris_i86pc.s
 endif
 
-libinktomi___a_LIBADD = ParseRules.o @LIBOBJS@
+libts_a_LIBADD = ParseRules.o @LIBOBJS@
 
 mkdfa_SOURCES = mkdfa.c
 
 test_atomic_SOURCES = test_atomic.cc
-test_atomic_LDADD = libinktomi++.a @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
+test_atomic_LDADD = libts.a @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
 test_atomic_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 
 test_freelist_SOURCES = test_freelist.cc
-test_freelist_LDADD = libinktomi++.a @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
+test_freelist_LDADD = libts.a @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
 test_freelist_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 
 test_arena_SOURCES = test_arena.cc
-test_arena_LDADD = libinktomi++.a @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
+test_arena_LDADD = libts.a @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@
 test_arena_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 
 test_List_SOURCES = test_List.cc

Modified: trafficserver/traffic/trunk/lib/ts/RawHashTable.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/RawHashTable.cc?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/RawHashTable.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/RawHashTable.cc Thu Dec  2 15:37:24 2010
@@ -1,6 +1,6 @@
 /** @file
 
-  C++ wrapper around libinktomi hash tables
+  C++ wrapper around libts hash tables
 
   @section license License
 
@@ -22,7 +22,7 @@
 
   @section details Details
 
-  These C++ RawHashTables are a C++ wrapper around libinktomi hash tables.
+  These C++ RawHashTables are a C++ wrapper around libts hash tables.
   They expose an interface very analogous to ink_hash_table, for better
   or for worse.  See HashTable for a more C++-oriented hash table.
 

Modified: trafficserver/traffic/trunk/lib/ts/RawHashTable.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/RawHashTable.h?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/RawHashTable.h (original)
+++ trafficserver/traffic/trunk/lib/ts/RawHashTable.h Thu Dec  2 15:37:24 2010
@@ -1,6 +1,6 @@
 /** @file
 
-  C++ wrapper around libinktomi hash tables
+  C++ wrapper around libts hash tables
 
   @section license License
 
@@ -22,7 +22,7 @@
 
   @section details Details
 
-  These C++ RawHashTables are a C++ wrapper around libinktomi hash tables.
+  These C++ RawHashTables are a C++ wrapper around libts hash tables.
   They expose an interface very analogous to ink_hash_table, for better
   or for worse. See HashTable for a more C++-oriented hash table.
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_error.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_error.h?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_error.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_error.h Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_error.h
 
-  Error reporting routines for libinktomi.a.
+  Error reporting routines for libts.a.
 
  ****************************************************************************/
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_file.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_file.cc?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_file.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_file.cc Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_file.c
 
-  File manipulation routines for libinktomi.a.
+  File manipulation routines for libts.a.
 
  ****************************************************************************/
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_file.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_file.h?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_file.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_file.h Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_file.h
 
-  File manipulation routines for libinktomi.a.
+  File manipulation routines for libts.a.
 
  ****************************************************************************/
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_memory.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_memory.cc?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_memory.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_memory.cc Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_memory.c
 
-  Memory allocation routines for libinktomi.a.
+  Memory allocation routines for libts.a.
 
  ****************************************************************************/
 
@@ -52,7 +52,7 @@ ink_malloc(size_t size)
   void *ptr = NULL;
 
   /*
-   * There's some nasty code in libinktomi that expects
+   * There's some nasty code in libts that expects
    * a MALLOC of a zero-sized item to wotk properly. Rather
    * than allocate any space, we simply return a NULL to make
    * certain they die quickly & don't trash things.

Modified: trafficserver/traffic/trunk/lib/ts/ink_memory.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_memory.h?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_memory.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_memory.h Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_memory.h
 
-  Memory allocation routines for libinktomi.a.
+  Memory allocation routines for libts.a.
 
  ****************************************************************************/
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_string.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_string.cc?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_string.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_string.cc Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_string.c
 
-  String and text processing routines for libinktomi.a.
+  String and text processing routines for libts.a.
 
  ****************************************************************************/
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_string.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_string.h?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_string.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_string.h Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_string.h
 
-  String and text processing routines for libinktomi.a.
+  String and text processing routines for libts.a.
 
  ****************************************************************************/
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_time.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_time.cc?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_time.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_time.cc Thu Dec  2 15:37:24 2010
@@ -24,7 +24,7 @@
 /****************************************************************************
   ink_time.c
 
-  Timing routines for libinktomi.a.
+  Timing routines for libts.a.
 
  ****************************************************************************/
 

Modified: trafficserver/traffic/trunk/lib/ts/ink_time.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_time.h?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_time.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_time.h Thu Dec  2 15:37:24 2010
@@ -25,7 +25,7 @@
 
   ink_time.h
 
-  Timing routines for libinktomi.a.
+  Timing routines for libts.a.
 
 
 

Modified: trafficserver/traffic/trunk/lib/ts/inktomi++.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/inktomi%2B%2B.h?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/inktomi++.h (original)
+++ trafficserver/traffic/trunk/lib/ts/inktomi++.h Thu Dec  2 15:37:24 2010
@@ -1,6 +1,6 @@
 /** @file
 
-  Primary include file for the libinktomi++ C++ library
+  Primary include file for the libts C++ library
 
   @section license License
 
@@ -22,7 +22,7 @@
 
   @section details Details
 
-  Libinktomi++ is a collection of useful functions and methods. It
+  libts is a collection of useful functions and methods. It
   includes commonly used:
     - data structures like queues, dynamic arrays atomic queues, etc.
     - string manipulation functions

Modified: trafficserver/traffic/trunk/lib/ts/test_atomic.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/test_atomic.cc?rev=1041414&r1=1041399&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/test_atomic.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/test_atomic.cc Thu Dec  2 15:37:24 2010
@@ -38,7 +38,7 @@
 //      definitions.  Prepend "..\proxy" to directories in proxy.
 //      Add "..\proxy".
 //   5) Replace C/C++ project option "/MLd" with "/MTd"
-//   6) Add libinktomi++ as dependency.
+//   6) Add libts as dependency.
 ////////////////////////////////////////////////////////////////////////////
 
 #include <unistd.h>

Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Thu Dec  2 15:37:24 2010
@@ -173,7 +173,7 @@ traffic_server_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/librecords/librecprocess.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ @LIBCAP@ \
@@ -231,7 +231,7 @@ traffic_logcat_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/librecords/librecprocess.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ @LIBM@ @LIBPROFILER@ \
@@ -300,7 +300,7 @@ traffic_logstats_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/librecords/librecprocess.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ @LIBM@ @LIBPROFILER@ \
@@ -367,7 +367,7 @@ traffic_sac_LDADD = \
   $(top_builddir)/iocore/net/libinknet.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/librecords/librecprocess.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
   @LIBPCRE@ @LIBDB@ @LIBSQLITE3@ @LIBSSL@ @LIBTCL@ @LIBDL@ @LIBEV@ \
   @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ @LIBM@ @LIBPROFILER@ \
@@ -384,7 +384,7 @@ endif
 
 libClusterHashStandalone_a_SOURCES = \
   ClusterHashStandalone.cc \
-  $(top_srcdir)/libinktomi++/ParseRules.cc
+  $(top_srcdir)/lib/ts/ParseRules.cc
 
 libTrafficServerStandalone_a_SOURCES = \
   signals.cc \

Modified: trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/Makefile.am Thu Dec  2 15:37:24 2010
@@ -55,6 +55,6 @@ load_http_hdr_SOURCES = \
   MIME.h
 
 load_http_hdr_LDADD = -L. -lhdrs \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   @LIBTCL@ @LIBRT@ @LIBTHREAD@
 load_http_hdr_LDFLAGS = @EXTRA_CXX_LDFLAGS@

Modified: trafficserver/traffic/trunk/proxy/issues.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/issues.txt?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/issues.txt (original)
+++ trafficserver/traffic/trunk/proxy/issues.txt Thu Dec  2 15:37:24 2010
@@ -242,7 +242,7 @@ void * buf;
 		
 
 +---------------------------+
-| libinktomi++/ink_hrtime.h |
+| lib/ts/ink_hrtime.h |
 +---------------------------+
 
 conversion routines

Modified: trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Makefile.am Thu Dec  2 15:37:24 2010
@@ -116,7 +116,7 @@ traffic_manager_LDADD = \
   $(top_builddir)/proxy/mgmt2/tools/libinksysapi.a \
   $(top_builddir)/proxy/mgmt2/tools/libinkconfigapi.a \
   $(top_builddir)/iocore/utils/libinkutils.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   @LIBEXPAT@ @LIBPCRE@ \
   @LIBSSL@ @LIBDB@ @LIBSQLITE3@ @LIBTCL@ @LIBICONV@ \
   @LIBM@ @LIBDL@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \

Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am Thu Dec  2 15:37:24 2010
@@ -50,6 +50,6 @@ endif
 traffic_api_cli_remote_LDADD = \
   libmgmtapiremote.a \
   $(top_builddir)/iocore/utils/libinkutils.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
   @LIBTCL@ @LIBDB@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBICONV@ @LIBEXECINFO@

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/Makefile.am Thu Dec  2 15:37:24 2010
@@ -65,7 +65,7 @@ traffic_line_SOURCES = \
 traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 traffic_line_LDADD = \
   libcli_tl.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   $(top_builddir)/librecords/libreclocal.a \
   $(top_builddir)/iocore/utils/libinkutils.a \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/Makefile.am Thu Dec  2 15:37:24 2010
@@ -76,7 +76,7 @@ traffic_shell_LDADD = \
   $(top_builddir)/proxy/mgmt2/tools/libinksysapi.a \
   $(top_builddir)/proxy/mgmt2/tools/libinkconfigapi.a \
   $(top_builddir)/proxy/mgmt2/utils/libutils_lm.a \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   $(top_builddir)/iocore/utils/libinkutils.a \
   $(LIBTCL) \
   @LIBDL@ \

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/Makefile.am Thu Dec  2 15:37:24 2010
@@ -27,7 +27,7 @@ bin_PROGRAMS = traffic_cop
 traffic_cop_SOURCES = TrafficCop.cc
 traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 traffic_cop_LDADD = \
-  $(top_builddir)/libinktomi++/libinktomi++.a \
+  $(top_builddir)/lib/ts/libts.a \
   $(top_builddir)/iocore/utils/libinkutils.a \
   @LIBTCL@ \
   @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \

Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/Makefile.am Thu Dec  2 15:37:24 2010
@@ -38,7 +38,7 @@ noinst_LIBRARIES = libutils_lm.a libutil
 
 libutils_lm_a_CPPFLAGS = -DLOCAL_MANAGER $(AM_CPPFLAGS)
 libutils_lm_a_SOURCES = \
-  $(top_srcdir)/libinktomi++/MatcherUtils.cc \
+  $(top_srcdir)/lib/ts/MatcherUtils.cc \
   $(top_srcdir)/proxy/DiagsConfig.cc \
   EnvBlock.cc \
   EnvBlock.h \

Modified: trafficserver/traffic/trunk/rc/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/rc/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/rc/Makefile.am (original)
+++ trafficserver/traffic/trunk/rc/Makefile.am Thu Dec  2 15:37:24 2010
@@ -33,6 +33,6 @@ update_records_SOURCES = update_records.
 update_records_LDFLAGS = @EXTRA_CXX_LDFLAGS@
 update_records_LDADD =	\
 			$(top_builddir)/proxy/mgmt2/librecords.a \
-			$(top_builddir)/libinktomi++/libinktomi++.a \
+			$(top_builddir)/lib/ts/libts.a \
 			@LIBICONV@ @LIBTHREAD@ @LIBRT@ @LIBTCL@ @LIBDL@ @LIBSSL@ @LIBEXECINFO@
 

Modified: trafficserver/traffic/trunk/test/deft/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/Makefile.am (original)
+++ trafficserver/traffic/trunk/test/deft/Makefile.am Thu Dec  2 15:37:24 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-INCLUDES = -I$(top_srcdir)/libinktomi++
+INCLUDES = -I$(top_srcdir)/lib/ts
 
 noinst_PROGRAMS = proc_manager test_exec test_log_collate
 
@@ -27,7 +27,7 @@ proc_manager_SOURCES = proc_manager.cc \
 		       test_utils.cc
 
 proc_manager_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-proc_manager_LDADD = $(top_builddir)/libinktomi++/libinktomi++.a \
+proc_manager_LDADD = $(top_builddir)/lib/ts/libts.a \
 		     @LIBSOCKET@ @LIBNSL@ \
 		     @LIBRESOLV@ @LIBRT@ @LIBTHREAD@ -lm @LIBDL@
 
@@ -41,7 +41,7 @@ test_log_collate_SOURCES = test_log_coll
 		           test_utils.cc
 
 test_log_collate_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-test_log_collate_LDADD = $(top_builddir)/libinktomi++/libinktomi++.a \
+test_log_collate_LDADD = $(top_builddir)/lib/ts/libts.a \
 		     	 @LIBSOCKET@ @LIBNSL@ \
 		     	 @LIBRESOLV@ @LIBRT@ @LIBTHREAD@ -lm @LIBDL@
 
@@ -57,7 +57,7 @@ test_exec_SOURCES = test_exec.cc \
 	            test_utils.cc
 
 test_exec_LDFLAGS = @EXTRA_CXX_LDFLAGS@
-test_exec_LDADD = $(top_builddir)/libinktomi++/libinktomi++.a \
+test_exec_LDADD = $(top_builddir)/lib/ts/libts.a \
 		     -L/usr/local/lib  \
 		     $(top_builddir)/f_pkg/misc/perl5.6.1/lib/DynaLoader.a \
 		     -L$(top_builddir)/f_pkg/misc/perl5.6.1/lib -lperl \

Modified: trafficserver/traffic/trunk/test/deft/proc_manager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/proc_manager.cc?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/proc_manager.cc (original)
+++ trafficserver/traffic/trunk/test/deft/proc_manager.cc Thu Dec  2 15:37:24 2010
@@ -30,7 +30,7 @@
 
  ****************************************************************************/
 
-// Avoiding getting the whole libinktomi++ header file since
+// Avoiding getting the whole libts header file since
 //  it causes problems with Sunpro 5.0
 #define	_inktomiplus_h_
 

Modified: trafficserver/traffic/trunk/test/deft/test_exec.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/test_exec.cc?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/test_exec.cc (original)
+++ trafficserver/traffic/trunk/test/deft/test_exec.cc Thu Dec  2 15:37:24 2010
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-// Avoiding getting the whole libinktomi++ header file since
+// Avoiding getting the whole libts header file since
 //  it causes problems with Sunpro 5.0
 #define	_inktomiplus_h_
 

Modified: trafficserver/traffic/trunk/test/plugin/INKAction/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/plugin/INKAction/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/plugin/INKAction/Makefile.am (original)
+++ trafficserver/traffic/trunk/test/plugin/INKAction/Makefile.am Thu Dec  2 15:37:24 2010
@@ -23,7 +23,7 @@ LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
 API_INC=../../../proxy/api/include
-LIBINK_INC=../../../../../ts-libinktomi
+LIBINK_INC=../../../../../lib/ts
 
 default: INKAction.so
 

Modified: trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/Makefile.am?rev=1041414&r1=1041413&r2=1041414&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/Makefile.am (original)
+++ trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/Makefile.am Thu Dec  2 15:37:24 2010
@@ -23,7 +23,7 @@ LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
 API_INC=../../../proxy/api/include
-LIBINK_INC=../../../../../ts-libinktomi
+LIBINK_INC=../../../../../lib/ts
 
 default: INKHttpHook.so INKHttpSsnHookAdd.so INKHttpSelAlt.so \
 	INKHttpTransaction.so INKHttpTxnErrBodySet.so