diff options
| author | Jonathan White <[email protected]> | 2008-09-12 13:24:05 -0600 |
|---|---|---|
| committer | Jonathan White <[email protected]> | 2008-09-12 13:25:40 -0600 |
| commit | 272810125b7dacde34d2d0a55a2afa19c72f5ee8 (patch) | |
| tree | 68029a744bfbfecebb1b09321a081c133985a6b8 /progs | |
| parent | c9c2b1b0163aa8803dc7ffb7fe1ef8f948f1e030 (diff) | |
Makefile was previously checked in with merge diffs still present. I just selected HEAD and removed the old.
Diffstat (limited to 'progs')
| -rwxr-xr-x[-rw-r--r--] | progs/fp/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/progs/fp/Makefile b/progs/fp/Makefile index ab43cde4f3a..ef6644cce27 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 $@ |