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.

diff --git a/configs/default b/configs/default
index 5489e49bd0f428b8da3e05fbcad025c21e6ca2c8..22e3fd830b2c1914ef72facf45c0cf6f123aa168 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -23,7 +23,7 @@ GLU_CFLAGS =
 # Misc tools and flags
 MKLIB_OPTIONS = 
 MKDEP = makedepend
-MKDEP_OPTIONS = -Y -fdepend
+MKDEP_OPTIONS = -fdepend
 MAKE = make
 
 # Library names (base name)

diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index a718ded57280d3ec26e045f213e494f8c7f1900b..5925f003340b4dc2f40b63b38b65317a361dd65a 100644 (file)
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -11,7 +11,8 @@ CXX = g++
 WARN_FLAGS = -Wall
 OPT_FLAGS = -O
 
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
 CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC
 
 ASM_SOURCES = 

diff --git a/configs/linux-dri b/configs/linux-dri
index 955da949076e98fb1dc1fe7b24555be843b0ba85..912ff5fb14be5062cb2fada96254fa0b0f529952 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -10,18 +10,22 @@ CC = gcc
 CXX = g++
 
 WARN_FLAGS = -Wall
-OPT_FLAGS = -O
-SOURCE_FLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-       -D_BSD_SOURCE -D_GNU_SOURCE
+OPT_FLAGS = -O -g
 PIC_FLAGS = -fPIC
 
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) $(ASM_FLAGS) \
-       -std=c99 $(PIC_FLAGS) -ffast-math $(SOURCE_FLAGS) -DPTHREADS \
-       -DUSE_EXTERNAL_DXTN_LIB=1 \
-       -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
 
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) -fPIC \
-       $(SOURCE_FLAGS)
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+       -D_BSD_SOURCE -D_GNU_SOURCE \
+       -DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
+
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+
+CFLAGS =  $(WARN_FLAGS) $(OPT_FLAGS) $(ASM_FLAGS) -std=c99 $(PIC_FLAGS) -ffast-math  \
+       $(DEFINES)
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
+       $(DEFINES)
+
 
 ASM_SOURCES = 
 

diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index c886d17c41845e1957422b5863a01a84bf545e48..616de54efb2f65a8f6d75f4fbd3d6f130d6fc4ce 100644 (file)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -9,9 +9,12 @@ CONFIG_NAME = linux-dri-x86-64
 CC = gcc
 CXX = g++
 
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE  -D__AMD64__ -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE  -D__AMD64__ 
 
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
+CFLAGS = -m64 -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math $(DEFINES)
+CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC $(DEFINES)
+
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
 
 #ASM_SOURCES = $(X86_SOURCES)
 

diff --git a/progs/miniglx/Makefile b/progs/miniglx/Makefile
index 825d50a47c3b933addae36e2dc9239d622b8cacc..7f1e162186f9575ab6fc36b962fec521a130cf51 100644 (file)
--- a/progs/miniglx/Makefile
+++ b/progs/miniglx/Makefile
@@ -47,7 +47,7 @@ clean:
 
 depend: $(SOURCES)
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
 
 # Emacs tags

diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile
index effd3749a493c6524fa5b94df8be5e135a7344ea..d9cf32565c648085dca5e437e923da3b924bd35b 100644 (file)
--- a/src/glut/beos/Makefile
+++ b/src/glut/beos/Makefile
@@ -92,6 +92,6 @@ clean:
 
 depend: $(SOURCES)
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
 include depend

diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 12c873d5112310ac76f92fb9da39e589e2a7abe2..161122ac91168494700367f02ddaf5576cc557f9 100644 (file)
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -107,6 +107,6 @@ depend: $(SOURCES)
        @ echo "running $(MKDEP)"
        @ touch depend
        @ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
-               > /dev/null 2>&1
+               > /dev/null 
 
 include depend

diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index d2cb5c744dbd327fa023c420facd660e531ece78..ab8fe3e19f1e0eb67d41d1f7b53c88e955986138 100644 (file)
--- 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
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
 # Emacs tags
 tags:

diff --git a/src/glw/Makefile b/src/glw/Makefile
index 393f8c3bcfb942e88fd3f3ac9da1c40472790eac..36b70ee57efbad6eb6c3f3eb5534ea3657565473 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -45,7 +45,7 @@ $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 depend: $(GLW_SOURCES)
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \
-               > /dev/null 2>&1
+               > /dev/null 
 
 
 include depend

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 4dea619b821039f037706b0edb11ca30cffd5135..7c2687b014a22083fdd32e9ab4e7fa22c43652af 100644 (file)
--- 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 2ef1b966fd8ba80da455fa92680e0d792b735035..a8fe53a62c2a44f0d37fc57543485b051833fe25 100644 (file)
--- 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

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index d77af533e1c00c3364ce6f0df5c21d67ca5add50..4672ace65e54cba36854c2ff283d9f2fd19794bd 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -172,8 +172,8 @@ SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
 depend: $(ALL_SOURCES)
        @ echo "running $(MKDEP)"
        @ touch depend
-       @ $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-               > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+               > /dev/null 
 
 
 # Emacs tags

diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index 3b1038b0d475d85abb11e5cbff6911a0c06730ce..41aa3a65c16af32366261f5cab14bff358974a7c 100644 (file)
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -11,7 +11,7 @@ MESA_MODULES = $(TOP)/src/mesa/mesa.a
 
 # GLU_DIR      = $(TOP)/src/glu/mesa
 ifeq ($(GLU_DIR),)
-       # By default, we build the SGI GLU implementation
+# By default, we build the SGI GLU implementation
        GLU_DIR = $(TOP)/src/glu/sgi
 endif
 
@@ -146,9 +146,9 @@ DRIVER_SOURCES = \
 ifeq ($(CPU), x86)
        DRIVER_SOURCES += $(addprefix ../../, $(X86_API))
 else
-       # No GL API PPC optimization yet
+# No GL API PPC optimization yet
 endif 
-       
+
 DRIVER_OBJECTS = $(DRIVER_SOURCES:.c=.o)
 DRIVER_OBJECTS := $(DRIVER_OBJECTS:.S=.o)
 
@@ -171,10 +171,10 @@ default: depend $(LIB_DIR) $(LIB_DIR)/$(GL_LIB_NAME)
 
 $(MESA_MODULES):
        cd $(TOP)/src/mesa; $(MAKE) mesa.a ;
-       
+
 $(GLU_MODULES):
        cd $(GLU_DIR); $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ; 
-       
+
 $(LIB_DIR):
        mkdir $(LIB_DIR)
 
@@ -187,9 +187,9 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
 
 depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 
 
 clean:
        rm -f depend $(OBJECTS)
-               
+
 include depend

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 3e8ac6693e79d62a8002bb976d61ea9a57977805..a9c8241df0fcc03cceff79febccb442fe4cfb71f 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -84,8 +84,8 @@ $(LIB_DIR)/$(LIBNAME):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
-               > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
+               > /dev/null 
 
 
 # Emacs tags

diff --git a/src/mesa/drivers/dri/dri_client/Makefile b/src/mesa/drivers/dri/dri_client/Makefile
index 35a7ed4cd0b9a0f28b5e366d1f52068790d887a0..9ec09e9a023eac6aaa1d713702e0facf85711f88 100644 (file)
--- a/src/mesa/drivers/dri/dri_client/Makefile
+++ b/src/mesa/drivers/dri/dri_client/Makefile
@@ -42,8 +42,8 @@ default: depend dri.a
 # what's included by any source file.
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) -Y $(INCLUDES) \
-               $(C_SOURCES) $(ASM_SOURCES) > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) \
+               $(C_SOURCES) $(ASM_SOURCES) 
 
 
 dri.a: $(OBJECTS)

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index a2aeeb5a9453de708436066b2e814d6e24ea11aa..e3045287fd45edcaf9c3bbb856dbf2189cf779bc 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -43,17 +43,16 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 X86_SOURCES = r200_vtxtmp_x86.S
 
 SYMLINKS = \
-       server/radeon_dri.c \
-       server/radeon_dri.h \
-       server/radeon.h \
-       server/radeon_macros.h \
-       server/radeon_reg.h 
+       server/radeon_dri.c 
+
 
 ##### TARGETS #####
 
 
 include ../Makefile.template
 
+INCLUDES += -I../radeon/server
+
 $(SYMLINKS):
        mkdir -p server
        for i in $(SYMLINKS) ; do rm -f $$i && test -f ../radeon/$$i && ln -s ../../radeon/$$i $$i ; done

diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile
index 4fe42a2fbff6ec9962af2c6bb51ab425095e1312..3b0b2e2848d1a8f8d36400b3d159e9df816edd7b 100644 (file)
--- a/src/mesa/drivers/dri/x11/Makefile
+++ b/src/mesa/drivers/dri/x11/Makefile
@@ -74,7 +74,7 @@ $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
-               > /dev/null 2>&1
+               > /dev/null 
 
 
 # Emacs tags