summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2004-12-08 15:16:36 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2004-12-08 15:16:36 +0000
commitfc236723273d4d872ae5e7cac876ea20175df10d (patch)
tree1d7e3461f665aa58b14ca0cb7100c1568a51cbd9 /src/glx
parente5aa3dd29b0b596a0dafab86ccec6e1f0013076f (diff)
Improve the behaviour of the build system wrt depend files.
- Remove the -Y option for makedepend, so that the standard directories are searched - No longer pipe the multiple errors that the -Y option caused into /dev/null -- we want to know about these failures. - Fix up a few other misc makedepend failures.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/mini/Makefile2
-rw-r--r--src/glx/x11/Makefile9
2 files changed, 5 insertions, 6 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 4dea619b82..7c2687b014 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -68,7 +68,7 @@ drmtest: xf86drm.o drmtest.o
depend: $(C_SOURCES) $(ASM_SOURCES)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
- > /dev/null 2>&1
+ > /dev/null
# Emacs tags
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 2ef1b966fd..a8fe53a62c 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -55,9 +55,7 @@ X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
OBJECTS = $(C_SOURCES:.c=.o) \
$(ASM_SOURCES:.S=.o)
-INCLUDES = -I. $(INCLUDE_DIRS)
-
-INCLUDE_DIRS = \
+INCLUDES = -I. \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
@@ -69,7 +67,8 @@ INCLUDE_DIRS = \
-I$(TOP)/src/mesa/swrast_setup \
-I$(TOP)/src/mesa/drivers/dri/common \
-I$(DRM_SOURCE_PATH)/libdrm \
- -I$(DRM_SOURCE_PATH)/shared
+ -I$(DRM_SOURCE_PATH)/shared \
+ $(X11_INCLUDES)
##### RULES #####
@@ -100,7 +99,7 @@ drmtest: xf86drm.o drmtest.o
depend: $(C_SOURCES) $(ASM_SOURCES)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
- > /dev/null 2>&1
+ > /dev/null
# Emacs tags