diff options
| author | Brian Paul <[email protected]> | 2003-06-02 15:42:23 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-06-02 15:42:23 +0000 |
| commit | c9ab99ced1fbfb230b3ccead51eb6c544a39e4fe (patch) | |
| tree | da382489529c992d3f5547ba19d1b7aa954884c0 /src/mesa | |
| parent | 45e9a5c46b8e18e7815ce69d0c2da9200b323f0f (diff) | |
updated rule for make OSMesa lib (Brad King)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/Makefile.X11 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index af3ae12c8a9..d918656c146 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -8,6 +8,7 @@ GL_MINOR = 4 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) GL_LIB_NAME = "GL" # may be overridden in Make-config +OSMESA_LIB_NAME = "OSMesa" # may be overridden in Make-config VPATH = RCS @@ -231,10 +232,12 @@ $(LIBDIR)/$(GL_LIB): $(OBJECTS) # Make the OSMesa library -$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) - if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o OSMesa \ +$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) $(LIBDIR)/$(GL_LIB) + if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \ - -L$(LIBDIR) -lGL -install $(LIBDIR) $(OSMESA_OBJECTS) ; fi + -L$(LIBDIR) -l$(GL_LIB_NAME) -install $(LIBDIR) \ + $(OSMESA_OBJECTS) ; fi + # Make an optional library with _just_ core objects libmesa: $(LIBDIR)/$(MESA_LIB) |