From 206e32934592b915b1f3052aecf014c6ced729e1 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sun, 7 Aug 2011 01:10:55 -0400
Subject: [PATCH] [test] test-object is not FreeType-specific, move it to the
 right place

---
 test/Makefile.am | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 18f36dfaa..b3c8cc220 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,6 +20,7 @@ TEST_PROGS = \
 	test-buffer \
 	test-common \
 	test-font \
+	test-object \
 	test-shape \
 	test-unicode \
 	test-version \
@@ -46,12 +47,9 @@ endif
 if HAVE_FREETYPE
 test_c_CPPFLAGS += $(FREETYPE_CFLAGS)
 test_cplusplus_CPPFLAGS += $(FREETYPE_CFLAGS)
+endif
 
-# TODO replace freetype with other stuff in the following test
-TEST_PROGS += test-object
-test_object_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
-test_object_LDADD = $(LDADD) $(FREETYPE_LIBS)
-
+if HAVE_FREETYPE
 TEST_PROGS += test-shape-complex
 test_shape_complex_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
 test_shape_complex_LDADD = $(LDADD) $(FREETYPE_LIBS)