libdrawtext

changeset 11:805936da8d6b

find changesets by author, revision, files, or words in the commit message
fixed to work on freebsd
author John Tsiombikas <nuclear@mutantstargoat.com>
date Wed, 05 Oct 2011 02:27:08 +0300
parents 5de80fdb40db
children 55c034e70809
files Makefile.in examples/simple/Makefile examples/unicode/Makefile
diffstat 3 files changed, 11 insertions(+), 9 deletions(-) [+]
line diff
     1.1 --- a/Makefile.in	Tue Sep 20 15:22:52 2011 +0300
     1.2 +++ b/Makefile.in	Wed Oct 05 02:27:08 2011 +0300
     1.3 @@ -23,8 +23,8 @@
     1.4  endif
     1.5  
     1.6  CC = gcc
     1.7 -CFLAGS = -pedantic -Wall -g -fPIC $(ft2_cflags)
     1.8 -LDFLAGS = $(ft2_libs) $(libgl)
     1.9 +CFLAGS = -pedantic -Wall -g -fPIC -I$(PREFIX)/include $(ft2_cflags)
    1.10 +LDFLAGS = -L$(PREFIX)/lib $(ft2_libs) $(libgl)
    1.11  
    1.12  .PHONY: all
    1.13  all: $(lib_a) $(lib_so)
    1.14 @@ -55,13 +55,15 @@
    1.15  	cp $(lib_a) $(PREFIX)/lib/$(lib_a)
    1.16  	cp $(lib_so) $(PREFIX)/lib/$(lib_so)
    1.17  	cp src/drawtext.h $(PREFIX)/include/drawtext.h
    1.18 -	[ -n "$(linkname)" ] && rm -f $(PREFIX)/lib/$(linkname) || true
    1.19 -	[ -n "$(linkname)" ] && cd $(PREFIX)/lib && ln -s $(lib_so) $(linkname) || true
    1.20 +	[ -n "$(linkname)" ] && rm -f $(PREFIX)/lib/$(linkname) \
    1.21 +		&& cd $(PREFIX)/lib && ln -s $(lib_so) $(linkname) \
    1.22 +		&& ln -s $(lib_so) $(soname) || true
    1.23  
    1.24  
    1.25  .PHONY: uninstall
    1.26  uninstall:
    1.27  	rm -f $(PREFIX)/lib/$(lib_a)
    1.28  	rm -f $(PREFIX)/lib/$(lib_so)
    1.29 -	rm -f $(PREFIX)/lib/$(name).so
    1.30 +	rm -f $(PREFIX)/lib/$(linkname)
    1.31 +	rm -f $(PREFIX)/lib/$(soname)
    1.32  	rm -f $(PREFIX)/include/drawtext.h

     2.1 --- a/examples/simple/Makefile	Tue Sep 20 15:22:52 2011 +0300
     2.2 +++ b/examples/simple/Makefile	Wed Oct 05 02:27:08 2011 +0300
     2.3 @@ -2,8 +2,8 @@
     2.4  bin = simple
     2.5  
     2.6  CC = gcc
     2.7 -CFLAGS = -pedantic -Wall -g -I../../src
     2.8 -LDFLAGS = -L. -ldrawtext $(libgl)
     2.9 +CFLAGS = -pedantic -Wall -g -I../../src -I/usr/local/include
    2.10 +LDFLAGS = -L. -L/usr/local/lib -ldrawtext $(libgl)
    2.11  
    2.12  font = serif.ttf
    2.13  

     3.1 --- a/examples/unicode/Makefile	Tue Sep 20 15:22:52 2011 +0300
     3.2 +++ b/examples/unicode/Makefile	Wed Oct 05 02:27:08 2011 +0300
     3.3 @@ -2,8 +2,8 @@
     3.4  bin = unicode
     3.5  
     3.6  CC = gcc
     3.7 -CFLAGS = -pedantic -Wall -g -I../../src
     3.8 -LDFLAGS = -L. -ldrawtext $(libgl)
     3.9 +CFLAGS = -pedantic -Wall -g -I../../src -I/usr/local/include
    3.10 +LDFLAGS = -L. -L/usr/local/lib -ldrawtext $(libgl)
    3.11  
    3.12  fonts = serif.ttf cjk.ttf klingon.ttf
    3.13