summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2004-06-01 00:39:34 +0000
committerEric Anholt <[email protected]>2004-06-01 00:39:34 +0000
commitf016e2509efd07f789793c12cf44caacc8bac9aa (patch)
treed553218c42aa42ec80a12e9d3fb32136745f4c42
parent2fb5d15ce38d8d298c4fbf8c0bb336154a314b13 (diff)
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".
-rw-r--r--src/glut/mini/Makefile2
-rw-r--r--src/glx/mini/Makefile3
-rw-r--r--src/mesa/drivers/dri/Makefile.template2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index 5c0f5f7fb66..ebb28d18c23 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 3c1c54a6414..c030641feb6 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 a0d3412a418..22b290395e2 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