From patchwork Fri Feb 11 13:56:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 549301 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1BDuR1s010165 for ; Fri, 11 Feb 2011 13:56:54 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D2C19ED73 for ; Fri, 11 Feb 2011 05:56:27 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qw0-f49.google.com (mail-qw0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A4949E732 for ; Fri, 11 Feb 2011 05:56:18 -0800 (PST) Received: by qwj9 with SMTP id 9so1475003qwj.36 for ; Fri, 11 Feb 2011 05:56:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:reply-to:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=qbPseQD7DrncQhiKq/CDc6QikmHbGtmqr3XVC6DUTrI=; b=P0GqpQT4ahcEVYFZwnS9BlLnQktmaLnP3D1NHdd/OdH+joWWcMXXqkGqrMwpufYJ9l liiHe3bpwEm3zNJneC2okK1hkNgw9/bQxtqWFgyG3y8FBiWpnJLo9kagSvc9mJC5YkNo FjEPBLQV9y/XqkchmOnAWAqzIE7O6LrUmLTf8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; b=iI2vdPvqNG/emBno5VIWlObqtg7x7yWUeDwy6w+XWt45D+IjecabCY6U+jBXcjGW8I 2dM++lu+ZCPLtlczqs3lJzzm5Km4r0nxb07usI8IzuXKOEjHeR5AaNbneJC4xRsZvDyH eQcHMhhymMxKG9qp2Jic9pp4vwxhj1Z3U8Obw= MIME-Version: 1.0 Received: by 10.224.60.193 with SMTP id q1mr548557qah.342.1297432577664; Fri, 11 Feb 2011 05:56:17 -0800 (PST) Received: by 10.229.38.76 with HTTP; Fri, 11 Feb 2011 05:56:17 -0800 (PST) In-Reply-To: References: Date: Fri, 11 Feb 2011 14:56:17 +0100 Message-ID: Subject: Re: [mesa] master broken with "make -j3" From: Sedat Dilek To: mesa3d-dev@lists.sourceforge.net Cc: Brian Paul , DRI X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: sedat.dilek@gmail.com List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 11 Feb 2011 13:56:54 +0000 (UTC) From a523ef0edbeac865368d945b142b2ba0ccb737e7 Mon Sep 17 00:00:00 2001 From: Sedat Dilek Date: Fri, 11 Feb 2011 14:47:04 +0100 Subject: [PATCH] Revert "glsl/Makefile: glcpp doesn't need libglsl.a." This reverts commit e0c1fc32832b66b52e6352ba563288ee48a1face. --- src/glsl/Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 3c00d1f..ec11c8a 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -152,8 +152,7 @@ install: glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@ -glcpp: glcpp/glcpp -glcpp/glcpp: $(GLCPP_OBJECTS) +glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) $(LIBS) -o $@ .cpp.o: -- 1.7.4