On Thu, Apr 1, 2010 at 12:36 PM, Jeremy Huddleston <jerem...@freedesktop.org> wrote: > > This helps debugging on darwin. > > Signed-off-by: Jeremy Huddleston <jerem...@apple.com> > --- > progs/xdemos/Makefile | 45 +++++++++++++++------------------------------ > 1 files changed, 15 insertions(+), 30 deletions(-) > > diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile > index d5c627a..29cba0c 100644 > --- a/progs/xdemos/Makefile > +++ b/progs/xdemos/Makefile > @@ -53,17 +53,18 @@ EXTRA_PROGS = \ > > ##### RULES ##### > > -.SUFFIXES: > -.SUFFIXES: .c > +.o: $(LIB_DEP) > + $(APP_CC) $(LDFLAGS) $< $(LIBS) -o $@ > > -.c: $(LIB_DEP) > - $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) > -o $@ > +.c.o: > + $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< -c -o $@ > > > ##### TARGETS ##### > > default: $(PROGS) > > +$(PROGS): $(PROGS:%=%.o)
Is this necessary? I would think the prereq would be picked up implicitly like the .c from the .o. > > extra: $(EXTRA_PROGS) > > @@ -74,45 +75,29 @@ clean: > > > # special cases > +pbutil.o: pbutil.h > +pbinfo.o: pbutil.h > pbinfo: pbinfo.o pbutil.o > $(APP_CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@ > > +pbdemo.o: pbutil.h > pbdemo: pbdemo.o pbutil.o > $(APP_CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@ > > -pbinfo.o: pbinfo.c pbutil.h > - $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c > - > -pbdemo.o: pbdemo.c pbutil.h > - $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbdemo.c > - > -pbutil.o: pbutil.c pbutil.h > - $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbutil.c > - > +glxgears_fbconfig.o: pbutil.h > glxgears_fbconfig: glxgears_fbconfig.o pbutil.o > $(APP_CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o > $@ > > -glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h > - $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) -c -I. $(CFLAGS) > glxgears_fbconfig.c > - > +xuserotfont.o: xuserotfont.h > +xrotfontdemo.o: xuserotfont.h > xrotfontdemo: xrotfontdemo.o xuserotfont.o > $(APP_CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o > $@ > > -xuserotfont.o: xuserotfont.c xuserotfont.h > - $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c > - > -xrotfontdemo.o: xrotfontdemo.c xuserotfont.h > - $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xrotfontdemo.c > - > +ipc.o: ipc.h > +corender.o: ipc.h > corender: corender.o ipc.o > $(APP_CC) $(CFLAGS) $(LDFLAGS) corender.o ipc.o $(LIBS) -o $@ > > -corender.o: corender.c ipc.h > - $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) corender.c > - > -ipc.o: ipc.c ipc.h > - $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c > - > -yuvrect_client: yuvrect_client.c > - $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) > -l$(GLU_LIB) -o $@ > +yuvrect_client: yuvrect_client.o > + $(APP_CC) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@ You dropped the CFLAGS from this last one, which can break when people put things like -m32 there. -- Dan ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
