From: Jonathan White <jwhite@tungstengraphics.com>
Date: Fri, 12 Sep 2008 19:24:05 +0000 (-0600)
Subject: Makefile was previously checked in with merge diffs still present.   I just selected... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=272810125b7dacde34d2d0a55a2afa19c72f5ee8;p=mesa.git

Makefile was previously checked in with merge diffs still present.   I just selected HEAD and removed the old.
---

diff --git a/progs/fp/Makefile b/progs/fp/Makefile
old mode 100644
new mode 100755
index ab43cde4f3a..ef6644cce27
--- a/progs/fp/Makefile
+++ b/progs/fp/Makefile
@@ -67,21 +67,15 @@ getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress.
 
 
 texrect: texrect.o readtex.o
-<<<<<<< HEAD:progs/fp/Makefile
 	$(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
-=======
-	$(APP_CC) texrect.o readtex.o $(LIBS) -o $@
->>>>>>> origin/gallium-0.1:progs/fp/Makefile
+#	$(APP_CC) texrect.o readtex.o $(LIBS) -o $@
 
 texrect.o: texrect.c readtex.h
 	$(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 invert: invert.o readtex.o
-<<<<<<< HEAD:progs/fp/Makefile
 	$(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
-=======
-	$(APP_CC) invert.o readtex.o $(LIBS) -o $@
->>>>>>> origin/gallium-0.1:progs/fp/Makefile
+#	$(APP_CC) invert.o readtex.o $(LIBS) -o $@
 
 invert.o: invert.c readtex.h
 	$(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@