Makefile adaption for freetype.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/canvas/test/Makefile.in b/contrib/samples/canvas/test/Makefile.in
index c30242f252bc060f89bb072bc25d88c8d3d84d88..bce306e5b6acd6c73b333f9bbb6c2b765e979aaf 100644 (file)
--- a/contrib/samples/canvas/test/Makefile.in
+++ b/contrib/samples/canvas/test/Makefile.in
@@ -17,7 +17,7 @@ PROGRAM=test
 
 OBJECTS=test.o
 
-APPEXTRALIBS=$(top_builddir)/lib/libcanvas.@WX_TARGET_LIBRARY_TYPE@ -lfreetype
+APPEXTRALIBS=$(top_builddir)/lib/libcanvas.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makeprog.env

diff --git a/contrib/src/canvas/Makefile.in b/contrib/src/canvas/Makefile.in
index 27722a9e965e85f415e55fc92866d5efff8f8098..3cf2445e2a8451de61ecbded45a67537f342ce46 100644 (file)
--- a/contrib/src/canvas/Makefile.in
+++ b/contrib/src/canvas/Makefile.in
@@ -17,7 +17,7 @@ HEADERS=canvas.h
 
 OBJECTS=canvas.o
 
-APPEXTRADEFS=-I$(top_srcdir)/contrib/include -I/usr/local/include
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 include $(top_builddir)/src/makelib.env