Committing in .

 OpenVMS support for new directory tree

 Modified Files:
 	Mesa-newtree/progs/demos/descrip.mms
 	Mesa-newtree/progs/tests/descrip.mms
 	Mesa-newtree/progs/xdemos/descrip.mms
 	Mesa-newtree/src/glu/sgi/descrip.mms
 	Mesa-newtree/src/glut/glx/descrip.mms
 	Mesa-newtree/src/mesa/main/descrip.mms
 Added Files:
 	Mesa-newtree/descrip.mms Mesa-newtree/mms-config.
 	Mesa-newtree/src/descrip.mms Mesa-newtree/src/glu/descrip.mms
 	Mesa-newtree/src/mesa/descrip.mms
 	Mesa-newtree/src/mesa/array_cache/descrip.mms
 	Mesa-newtree/src/mesa/drivers/osmesa/descrip.mms
 	Mesa-newtree/src/mesa/drivers/x11/descrip.mms
 	Mesa-newtree/src/mesa/glapi/descrip.mms
 	Mesa-newtree/src/mesa/math/descrip.mms
 	Mesa-newtree/src/mesa/swrast/descrip.mms
 	Mesa-newtree/src/mesa/swrast_setup/descrip.mms
 	Mesa-newtree/src/mesa/tnl/descrip.mms
 	Mesa-newtree/vms/analyze_map.com Mesa-newtree/vms/xlib.opt
 	Mesa-newtree/vms/xlib_share.opt
 ----------------------------------------------------------------------

2 files changed, 20 insertions, 11 deletions

diff --git a/src/glu/descrip.mms b/src/glu/descrip.mms
new file mode 100644
index 00000000000..6d5cd858dac
--- /dev/null
+++ b/src/glu/descrip.mms
@@ -0,0 +1,9 @@
+# Makefile for Mesa for VMS
+# contributed by Jouk Jansen  [email protected]
+
+all :
+# PIPE is avalailable on VMS7.0 and higher. For lower versions split the
+#command in two conditional command.   JJ
+	if f$search("SYS$SYSTEM:CXX$COMPILER.EXE") .nes. "" then pipe set default [.sgi] ; $(MMS)$(MMSQUALIFIERS)
+	if f$search("SYS$SYSTEM:CXX$COMPILER.EXE") .eqs. "" then pipe set default [.mesa] ; $(MMS)$(MMSQUALIFIERS)
+	set default [-]
diff --git a/src/glu/sgi/descrip.mms b/src/glu/sgi/descrip.mms
index e1cbfbabcd2..1f795d8480f 100644
--- a/src/glu/sgi/descrip.mms
+++ b/src/glu/sgi/descrip.mms
@@ -2,9 +2,9 @@
 # contributed by Jouk Jansen  [email protected]
 
 .first
-	define gl [-.include.gl]
+	define gl [---.include.gl]
 
-.include [-]mms-config.
+.include [---]mms-config.
 
 ##### MACROS #####
 
@@ -12,7 +12,7 @@ VPATH = RCS
 
 INCDIR =([-.include],[.include],[.internals],[.libnurbs.internals],\
        [.libnurbs.interface],[.libnurbs.nurbtess])
-LIBDIR = [-.lib]
+LIBDIR = [---.lib]
 CFLAGS = /include=$(INCDIR)/name=(as_is,short)
 
 LU_OBJECTS=\
@@ -136,6 +136,9 @@ $(LIBDIR)$(GLU_LIB) : $(LU_OBJECTS) $(LT_OBJECTS) $(LI_OBJECTS) $(LI_OBJECTS1)\
 		    $(LI2_OBJECTS6) $(LI2_OBJECTS7) $(LI2_OBJECTS8)\
 		    $(LN_OBJECTS) $(LN_OBJECTS1) $(LN_OBJECTS2)\
 		    $(LN_OBJECTS3) $(LN_OBJECTS4)
+  @ $(MAKELIB) $(GLU_LIB)  $(LU_OBJECTS),$(LT_OBJECTS),$(LI_OBJECTS),\
+	$(LI2_OBJECTS),$(LN_OBJECTS)
+  @ rename $(GLU_LIB)* $(LIBDIR)
 .ifdef SHARE
   @ WRITE_ SYS$OUTPUT "  generating mesagl1.opt"
   @ OPEN_/WRITE FILE  mesagl1.opt
@@ -162,7 +165,7 @@ $(LIBDIR)$(GLU_LIB) : $(LU_OBJECTS) $(LT_OBJECTS) $(LI_OBJECTS) $(LI_OBJECTS1)\
   @ WRITE_ FILE "$(LN_OBJECTS2)"
   @ WRITE_ FILE "$(LN_OBJECTS3)"
   @ WRITE_ FILE "$(LN_OBJECTS4)"
-  @ WRITE_ FILE "[-.lib]libmesagl.exe/SHARE"
+  @ WRITE_ FILE "[---.lib]libmesagl.exe/SHARE"
   @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
   @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
   @ CLOSE_ FILE
@@ -170,14 +173,11 @@ $(LIBDIR)$(GLU_LIB) : $(LU_OBJECTS) $(LT_OBJECTS) $(LI_OBJECTS) $(LI_OBJECTS1)\
 #  @ CXXLINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
 #  @ WRITE_ SYS$OUTPUT "  analyzing mesagl.map ..."
 #  @ @[-.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
-  @ WRITE_ SYS$OUTPUT "  linking $(GLU_LIB) ..."
-#  @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_LIB)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
-  @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_LIB)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesaglu.opt/opt
-.else
-  @ $(MAKELIB) $(GLU_LIB)  $(LU_OBJECTS),$(LT_OBJECTS),$(LI_OBJECTS),\
-	$(LI2_OBJECTS),$(LN_OBJECTS)
+  @ WRITE_ SYS$OUTPUT "  linking $(GLU_SHAR) ..."
+#  @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
+  @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesaglu.opt/opt
+  @ rename $(GLU_SHAR)* $(LIBDIR)
 .endif
-  @ rename $(GLU_LIB)* $(LIBDIR)
 
 clean :
 	delete [...]*.obj;*