Dan Nicholson wrote: > On Nov 11, 2007 12:54 AM, Brice Goglin <[EMAIL PROTECTED]> wrote: >> 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. >> 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. > > Yeah, I thought about that problem, but like Brian says, some of the > xdemos apps use libGLU. I had noticed that Debian doesn't build GLU. > That's a case that's tough to handle, though, but I would like that to > be supported. For now, I'd suggest just building with PROGRAM_DIRS="" > and manually building glxinfo/glxgears as needed. > > Maybe the xdemos Makefile can be broken down further with a little > make conditional: > > PROGS = <all progs needing just libGL> > GLU_PROGS = <all progs needing libGLU> > LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) > LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) > ifneq (,$(shell ls $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)) > PROGS += $(GLU_PROGS) > LIB_DEP += $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) > LIBS += -l$(GLU_LIB) > endif
Conditionals like that won't work with non-GNU make. I'd be OK with putting PROGRAM_DIRS="" as before. -Brian ------------------------------------------------------------------------- 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
