From f016e2509efd07f789793c12cf44caacc8bac9aa Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 1 Jun 2004 00:39:34 +0000 Subject: Missed in last commit: Build fixing for FreeBSD. GNU make is installed as gmake, so make a MAKE variable (defaults to "make") and use that. Use the MKDEP and MKDEP_OPTIONS more. Our shell isn't bash, so change the instances of ">& /dev/null" to a more compatible "> /dev/null 2>&1". --- src/glut/mini/Makefile | 2 +- src/glx/mini/Makefile | 3 ++- src/mesa/drivers/dri/Makefile.template | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile index 5c0f5f7fb6..ebb28d18c2 100644 --- a/src/glut/mini/Makefile +++ b/src/glut/mini/Makefile @@ -65,7 +65,7 @@ $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) # what's included by any source file. depend: $(SOURCES) touch depend - makedepend -fdepend -Y $(INCLUDES) $(SOURCES) >& /dev/null + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1 # Emacs tags tags: diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile index 3c1c54a641..c030641feb 100644 --- a/src/glx/mini/Makefile +++ b/src/glx/mini/Makefile @@ -57,7 +57,8 @@ drmtest: xf86drm.o drmtest.o depend: $(C_SOURCES) $(ASM_SOURCES) touch depend - makedepend -fdepend -Y $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) >& /dev/null + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ + > /dev/null 2>&1 # Emacs tags diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index a0d3412a41..22b290395e 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -85,7 +85,7 @@ $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile ../Makefil depend: $(C_SOURCES) $(ASM_SOURCES) touch depend $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ - >& /dev/null + > /dev/null 2>&1 # Emacs tags -- cgit v1.2.3