diff options
| -rw-r--r-- | progs/demos/Makefile | 12 | ||||
| -rw-r--r-- | progs/fp/Makefile | 6 | ||||
| -rw-r--r-- | progs/slang/Makefile | 14 | ||||
| -rw-r--r-- | progs/trivial/Makefile | 4 | ||||
| -rw-r--r-- | progs/xdemos/Makefile | 8 |
5 files changed, 22 insertions, 22 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile index fedce1cc3d..81d9ebed86 100644 --- a/progs/demos/Makefile +++ b/progs/demos/Makefile @@ -125,41 +125,41 @@ extfuncs.h: $(TOP)/progs/util/extfuncs.h reflect: reflect.o showbuffer.o readtex.o - $(CC) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@ reflect.o: reflect.c showbuffer.h $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c shadowtex: shadowtex.o showbuffer.o - $(CC) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@ shadowtex.o: shadowtex.c showbuffer.h $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c gloss: gloss.o trackball.o readtex.o - $(CC) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@ gloss.o: gloss.c trackball.h $(CC) -c -I$(INCDIR) $(CFLAGS) gloss.c engine: engine.o trackball.o readtex.o - $(CC) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@ engine.o: engine.c trackball.h $(CC) -c -I$(INCDIR) $(CFLAGS) engine.c fslight: fslight.o - $(CC) $(LDFLAGS) fslight.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) fslight.o $(LIBS) -o $@ fslight.o: fslight.c extfuncs.h $(CC) -c -I$(INCDIR) $(CFLAGS) fslight.c rain: particles.o rain.o readtex.o - $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@ + $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ rain.o: rain.cxx readtex.h $(CXX) -c -I$(INCDIR) $(CXXFLAGS) $< diff --git a/progs/fp/Makefile b/progs/fp/Makefile index 09f22d1a7b..3e52474777 100644 --- a/progs/fp/Makefile +++ b/progs/fp/Makefile @@ -72,7 +72,7 @@ UTIL_FILES = readtex.h readtex.c .SUFFIXES: .c .c: - $(CC) $(INCLUDES) $(CFLAGS) $< $(LIBS) -o $@ + $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ @@ -99,13 +99,13 @@ getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress. texrect: texrect.o readtex.o - $(CC) texrect.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@ texrect.o: texrect.c readtex.h $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ invert: invert.o readtex.o - $(CC) invert.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@ invert.o: invert.c readtex.h $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ diff --git a/progs/slang/Makefile b/progs/slang/Makefile index c93caeab61..f6f34fcd25 100644 --- a/progs/slang/Makefile +++ b/progs/slang/Makefile @@ -31,27 +31,27 @@ clean: # cltest: cltest.o framework.o $(LIB_DEP) - $(CC) $(LDFLAGS) cltest.o framework.o $(LIBS) -o cltest + $(CC) $(CFLAGS) $(LDFLAGS) cltest.o framework.o $(LIBS) -o cltest sotest: sotest.o framework.o $(LIB_DEP) - $(CC) $(LDFLAGS) sotest.o framework.o $(LIBS) -o sotest + $(CC) $(CFLAGS) $(LDFLAGS) sotest.o framework.o $(LIBS) -o sotest vstest: vstest.o framework.o $(LIB_DEP) - $(CC) $(LDFLAGS) vstest.o framework.o $(LIBS) -o vstest + $(CC) $(CFLAGS) $(LDFLAGS) vstest.o framework.o $(LIBS) -o vstest # # objects # framework.o: framework.c framework.h - $(CC) -c -I$(INCDIR) framework.c -o framework.o + $(CC) -c -I$(INCDIR) $(CFLAGS) framework.c -o framework.o cltest.o: cltest.c framework.h - $(CC) -c -I$(INCDIR) cltest.c -o cltest.o + $(CC) -c -I$(INCDIR) $(CFLAGS) cltest.c -o cltest.o sotest.o: sotest.c framework.h - $(CC) -c -I$(INCDIR) sotest.c -o sotest.o + $(CC) -c -I$(INCDIR) $(CFLAGS) sotest.c -o sotest.o vstest.o: vstest.c framework.h - $(CC) -c -I$(INCDIR) vstest.c -o vstest.o + $(CC) -c -I$(INCDIR) $(CFLAGS) vstest.c -o vstest.o diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index 6fa51ce2cf..e72fb07889 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -115,13 +115,13 @@ getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress. texrect: texrect.o readtex.o - $(CC) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@ texrect.o: texrect.c readtex.h $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ invert: invert.o readtex.o - $(CC) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@ invert.o: invert.c readtex.h $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index c90159bd38..b259671210 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -67,10 +67,10 @@ clean: # special cases pbinfo: pbinfo.o pbutil.o - $(CC) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@ pbdemo: pbdemo.o pbutil.o - $(CC) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@ pbinfo.o: pbinfo.c pbutil.h $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c @@ -82,13 +82,13 @@ pbutil.o: pbutil.c pbutil.h $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbutil.c glxgears_fbconfig: glxgears_fbconfig.o pbutil.o - $(CC) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@ glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c xrotfontdemo: xrotfontdemo.o xuserotfont.o - $(CC) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@ xuserotfont.o: xuserotfont.c xuserotfont.h $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c |