From owner-p4-projects@FreeBSD.ORG  Wed Nov  7 02:19:22 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id ECBE580C; Wed,  7 Nov 2012 02:19:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AAE7E80A
 for <perforce@freebsd.org>; Wed,  7 Nov 2012 02:19:21 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 9065B8FC0A
 for <perforce@freebsd.org>; Wed,  7 Nov 2012 02:19:21 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id qA72JLfK096601
 for <perforce@freebsd.org>; Wed, 7 Nov 2012 02:19:21 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id qA72JLDd096598
 for perforce@freebsd.org; Wed, 7 Nov 2012 02:19:21 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 7 Nov 2012 02:19:21 GMT
Message-Id: <201211070219.qA72JLDd096598@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219641 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 02:19:22 -0000

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