Move SkTSort.h back to private, and instead allow in the makefile for tests to

see private headers. This also means the tests don't have to use ../.. to find
the private header they want.

git-svn-id: http://skia.googlecode.com/svn/trunk@107 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/Makefile b/Makefile
index bb122ef..c08d0bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,9 @@ bench: $(BENCH_OBJS) out/libskia.a
        
 ##############################################################################
 
+# we let tests cheat and see private headers, so we can unittest modules
+C_INCLUDES += -Isrc/core
+
 TESTS_SRCS := GeometryTest.cpp MathTest.cpp MatrixTest.cpp PackBitsTest.cpp \
               Sk64Test.cpp StringTest.cpp Test.cpp UtilsTest.cpp PathTest.cpp \
               ClipCubicTest.cpp SrcOverTest.cpp main.cpp

diff --git a/include/core/SkTSort.h b/src/core/SkTSort.h
similarity index 100%
rename from include/core/SkTSort.h
rename to src/core/SkTSort.h

diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index e9820f6..905b733 100644 (file)
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -1,6 +1,6 @@
 #include "Test.h"
 
-#include "../../src/core/SkCubicClipper.h"
+#include "SkCubicClipper.h"
 #include "SkGeometry.h"