Check if mesa_vp->Base.Parameters is null before dereferencing (bug report

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index a7091f51036afa14d6c7d648bbbaf315fd818654..0e150febd6c1bfe12ad8006f12580750c7bf071f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,9 @@ realclean:
 
 
 install:
-       @echo "Installing"
-       $(TOP)/bin/installmesa $(DESTDIR)
+       @for dir in $(SUBDIRS) ; do \
+               (cd $$dir ; $(MAKE) install) || exit 1 ; \
+       done
 
 # DirectFBGL module installation
 linux-directfb-install:
@@ -102,6 +103,7 @@ linux-ia64-icc \
 linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
+linux-osmesa \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
@@ -129,6 +131,7 @@ osf1 \
 osf1-static \
 solaris-x86 \
 solaris-x86-gcc \
+solaris-x86-gcc-static \
 sunos4 \
 sunos4-gcc \
 sunos4-static \
@@ -141,6 +144,10 @@ sunos5-v8-static \
 sunos5-v9 \
 sunos5-v9-static \
 ultrix-gcc:
+       @ if [ -e configs/current ] ; then \
+               echo "Please run 'make realclean' before changing configs" ; \
+               exit 1 ; \
+       fi
        (cd configs && rm -f current && ln -s $@ current)
        $(MAKE) default
 
@@ -373,11 +380,14 @@ GLUT_FILES = \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
        $(DIRECTORY)/src/glut/ggi/*.[ch]                \
        $(DIRECTORY)/src/glut/ggi/Makefile              \
+       $(DIRECTORY)/src/glut/fbdev/Makefile            \
+       $(DIRECTORY)/src/glut/fbdev/*[ch]               \
        $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp    \
        $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
 
 DEPEND_FILES = \
        $(TOP)/src/mesa/depend          \
+       $(TOP)/src/glx/x11/depend       \
        $(TOP)/src/glw/depend           \
        $(TOP)/src/glut/glx/depend      \
        $(TOP)/src/glu/sgi/depend