summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
Diffstat (limited to 'progs')
-rwxr-xr-x[-rw-r--r--]progs/fp/Makefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/progs/fp/Makefile b/progs/fp/Makefile
index ab43cde4f3..ef6644cce2 100644..100755
--- 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 $@