summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Makefile.X1116
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 9f3377e8b73..12790a56b74 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -309,15 +309,20 @@ $(LIBDIR)/$(GL_LIB): $(OBJECTS)
# Make the OSMesa library
$(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
- if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \
- -L$(LIBDIR) -l$(GL_LIB_NAME) -install $(LIBDIR) \
- $(OSMESA_OBJECTS) ; fi
+ if [ ${OSMESA_LIB} ] ; then \
+ $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
+ -minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
+ -l$(GL_LIB_NAME) -install $(LIBDIR) \
+ $(OSMESA_OBJECTS) ; \
+ fi
# Make an optional library with _just_ core objects
libmesa: $(LIBDIR)/$(MESA_LIB)
- if [ ${MESA_LIB} ] ; then $(MAKELIB) $(MESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(CORE_OBJECTS) ; fi
+ if [ ${MESA_LIB} ] ; then \
+ $(MAKELIB) $(MESA_LIB) $(MESA_MAJOR) \
+ $(MESA_MINOR) $(GL_TINY) $(CORE_OBJECTS) ; \
+ fi
if [ ${MESA_LIB} ] ; then rm -f $(LIBDIR)/$(MESA_LIB)* ; fi
if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi
@@ -327,6 +332,7 @@ mesa.a: $(CORE_OBJECTS)
rm -f $@ && ar rcv $@ $(CORE_OBJECTS) && ranlib $@
+
# Run 'make -f Makefile.X11 dep' to update the dependencies if you change
# what's included by any source file.
dep: $(CORE_SOURCES) $(DRIVER_SOURCES) $(OSMESA_DRIVER_SOURCES) $(ASM_SOURCES)