walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build with glib but not freetype

This commit is contained in:
Behdad Esfahbod 2011-08-02 13:44:24 -04:00
parent c21be799da
commit 4f052b93c0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/Makefile.am
View File

@ -20,7 +20,6 @@ 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 \
@ -45,13 +44,13 @@ 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)
# TODO replace freetype with other stuff in the following test # TODO replace freetype with other stuff in the following test
TEST_PROGS += test-object
test_object_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS) test_object_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
test_object_LDADD = $(LDADD) $(FREETYPE_LIBS) test_object_LDADD = $(LDADD) $(FREETYPE_LIBS)
TEST_PROGS += \ TEST_PROGS += test-shape-complex
test-shape-complex \
$(NULL)
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)
endif endif