Dan Nicholson wrote: > This commit adds the necessary libraries for the programs in each > specific Makefile. Previously, all programs were linked with libraries > listed in the $(APP_LIB_DEPS) variable. This effectively meant that the > libraries to link into applications was hardcoded. Instead, the contents > of $(APP_LIB_DEPS) should be reserved for generic or platform-specific > libraries. > > This change helps in places like progs/xdemos, which don't require > libglut and may not have been built. >
Hi, While building Mesa 7.0.2 for Debian, I got an link error in progs/xdemos/ because it was trying to link with libGLU which wasn't built. Since these programs don't seem to need libGLU at all (it worked fine without it earlier), I don't understand why you added -l$(GLU_LIB) to LIBS below. There might be some similar problems in other progs/ subdirectories, I didn't check. Cheers, Brice > diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile > index a7ba9af..d49b3d2 100644 > --- a/progs/xdemos/Makefile > +++ b/progs/xdemos/Makefile > @@ -8,6 +8,8 @@ INCDIR = $(TOP)/include > > LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) > > +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) > + > PROGS = \ > corender \ > glthreads \ > @@ -41,7 +43,7 @@ PROGS = \ > .SUFFIXES: .c > > .c: $(LIB_DEP) > - $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< > $(APP_LIB_DEPS) -o $@ > + $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ > > > ##### TARGETS ##### > @@ -56,10 +58,10 @@ clean: > > # special cases > pbinfo: pbinfo.o pbutil.o > - $(CC) $(LDFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@ > + $(CC) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@ > > pbdemo: pbdemo.o pbutil.o > - $(CC) $(LDFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@ > + $(CC) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@ > > pbinfo.o: pbinfo.c pbutil.h > $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c > @@ -71,13 +73,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 $(APP_LIB_DEPS) -o $@ > + $(CC) $(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 $(APP_LIB_DEPS) -o $@ > + $(CC) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@ > > xuserotfont.o: xuserotfont.c xuserotfont.h > $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c > @@ -86,10 +88,10 @@ xrotfontdemo.o: xrotfontdemo.c xuserotfont.h > $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xrotfontdemo.c > > corender: corender.o ipc.o > - $(CC) $(CFLAGS) corender.o ipc.o $(APP_LIB_DEPS) -o $@ > + $(CC) $(CFLAGS) corender.o ipc.o $(LIBS) -o $@ > > corender.o: corender.c ipc.h > $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) corender.c > > ipc.o: ipc.c ipc.h > - $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c > \ No newline at end of file > + $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c > ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
