Date: Wed, 7 Nov 2012 02:19:21 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219641 for review Message-ID: <201211070219.qA72JLDd096598@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219641?ac=10 Change 219641 by brooks@brooks_zenith on 2012/11/07 02:19:15 loop in the correct readpng makefile. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/Makefile#2 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/Makefile#2 (text+ko) ==== @@ -4,20 +4,22 @@ PROG= readpng -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR}/../../../ctsrd-lib/libimagebox SRCS= readpng.c pngbox.c MAN= BINDIR= /usr/libexec +CFLAGS+= -I${.CURDIR}/../../../ctsrd-lib/libimagebox .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -I${.CURDIR}/.. -I/usr/local/include -LDFLAGS+= -L/usr/local/lib -lpng -lpthread -lz -lm +CFLAGS+= -I/usr/local/include +LDFLAGS+= -L/usr/local/lib .else -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../libvuln_png -LDFLAGS+= -lvuln_png -lpthread -lz -lm +CFLAGS+= -I${.CURDIR}/../../libvuln_png +LDFLAGS+= -lvuln_png .endif +LDFLAGS+= -lpthread -lz -lm WARNS= 6
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211070219.qA72JLDd096598>