[test] test-object is not FreeType-specific, move it to the right place
This commit is contained in:
parent
577326b86a
commit
206e329345
|
@ -20,6 +20,7 @@ TEST_PROGS = \
|
||||||
test-buffer \
|
test-buffer \
|
||||||
test-common \
|
test-common \
|
||||||
test-font \
|
test-font \
|
||||||
|
test-object \
|
||||||
test-shape \
|
test-shape \
|
||||||
test-unicode \
|
test-unicode \
|
||||||
test-version \
|
test-version \
|
||||||
|
@ -46,12 +47,9 @@ endif
|
||||||
if HAVE_FREETYPE
|
if HAVE_FREETYPE
|
||||||
test_c_CPPFLAGS += $(FREETYPE_CFLAGS)
|
test_c_CPPFLAGS += $(FREETYPE_CFLAGS)
|
||||||
test_cplusplus_CPPFLAGS += $(FREETYPE_CFLAGS)
|
test_cplusplus_CPPFLAGS += $(FREETYPE_CFLAGS)
|
||||||
|
endif
|
||||||
|
|
||||||
# TODO replace freetype with other stuff in the following test
|
if HAVE_FREETYPE
|
||||||
TEST_PROGS += test-object
|
|
||||||
test_object_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
|
|
||||||
test_object_LDADD = $(LDADD) $(FREETYPE_LIBS)
|
|
||||||
|
|
||||||
TEST_PROGS += test-shape-complex
|
TEST_PROGS += test-shape-complex
|
||||||
test_shape_complex_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
|
test_shape_complex_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
|
||||||
test_shape_complex_LDADD = $(LDADD) $(FREETYPE_LIBS)
|
test_shape_complex_LDADD = $(LDADD) $(FREETYPE_LIBS)
|
||||||
|
|
Loading…
Reference in New Issue