summaryrefslogtreecommitdiff
path: root/src/mesa/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/Makefile')
-rw-r--r--src/mesa/Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 31f64c5f27..ea844afae7 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -21,11 +21,11 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
# Figure out what to make here
default:
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
- make linux-solo ; \
+ $(MAKE) linux-solo ; \
elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
- make osmesa-only ; \
+ $(MAKE) osmesa-only ; \
else \
- make stand-alone ; \
+ $(MAKE) stand-alone ; \
fi
@@ -58,7 +58,7 @@ mesa.a: $(SOLO_OBJECTS)
# target, otherwise make will look & see that the "drivers" directory
# already exists, so not try to rebuild it...
driver-dirs:
- cd drivers/dri ; make
+ cd drivers/dri ; $(MAKE)
######################################################################
@@ -101,7 +101,7 @@ stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NA
osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME)
subdirs:
- @ (cd x86 ; make)
+ @ (cd x86 ; $(MAKE))
# Make the GL library
$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
@@ -159,7 +159,8 @@ SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
# Update dependencies
depend: $(ALL_SOURCES)
touch depend
- $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) >& /dev/null
+ $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+ > /dev/null 2>&1
# Emacs tags
@@ -170,7 +171,7 @@ clean:
-rm -f */*.o
rm -f depend mesa.a
for dir in $(SUBDIRS) ; do \
- (cd $$dir ; make clean) ; \
+ (cd $$dir ; $(MAKE) clean) ; \
done
include depend