guard ResetStipple calls

[mesa.git] / Makefile.X11

diff --git a/Makefile.X11 b/Makefile.X11
index 4b6530b5f564a3e7bfdc05b654113b8783991939..093807bfaa9e1dc914804ec10b7a1f69fb609fff 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.53 2001/09/23 18:19:30 brianp Exp $
+# $Id: Makefile.X11,v 1.58 2001/11/30 19:42:10 kschultz Exp $
 
 # Mesa 3-D graphics library
-# Version:  4.0
+# Version:  4.1
 # 
 # Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
 # 
@@ -42,6 +42,7 @@ default:
        @echo "  make bsdos4               for BSD/OS 4.x, dynamic libraries"
        @echo "  make cygnus               for Win95/NT using Cygnus-Win32"
        @echo "  make cygnus-linux         for Win95/NT using Cygnus-Win32 under Linux"
+       @echo "  make darwin               for Darwin - Mac OS X"
        @echo "  make dgux                 for Data General"
        @echo "  make freebsd              for FreeBSD systems with GCC"
        @echo "  make freebsd-386          for FreeBSD systems with GCC, w/ Intel assembly"
@@ -137,7 +138,7 @@ default:
 # XXX we may have to split up this group of targets into those that
 # have a C++ compiler and those that don't for the SI-GLU library.
 
-aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
+aix aix-sl amix bsdos bsdos4 darwin dgux freebsd freebsd-386 gcc \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
@@ -408,7 +409,6 @@ LIB_FILES = \
        $(DIRECTORY)/src/Makefile*                                      \
        $(DIRECTORY)/src/libGL_la_SOURCES                               \
        $(DIRECTORY)/src/descrip.mms                                    \
-       $(DIRECTORY)/src/mms_depend                                     \
        $(DIRECTORY)/src/mesa.conf                                      \
        $(DIRECTORY)/src/*.def                                          \
        $(DIRECTORY)/src/depend                                         \
@@ -426,6 +426,9 @@ LIB_FILES = \
        $(DIRECTORY)/src/tnl/*.[ch]                                     \
        $(DIRECTORY)/src/tnl/Makefile*                                  \
        $(DIRECTORY)/src/tnl/libMesaTnl_la_SOURCES                      \
+       $(DIRECTORY)/src/tnl_dd/*.[ch]                                  \
+       $(DIRECTORY)/src/tnl_dd/imm/*.[ch]                              \
+       $(DIRECTORY)/src/tnl_dd/imm/NOTES.imm                           \
        $(DIRECTORY)/src/windml/*.[ch]                                  \
        $(DIRECTORY)/src/windml/tornado/*.c                             \
        $(DIRECTORY)/src/windml/tornado/*.cdf                           \
@@ -462,6 +465,8 @@ LIB_FILES = \
        $(DIRECTORY)/src/KNOWN_BUGS                                     \
        $(DIRECTORY)/src/OSmesa/Makefile.am                             \
        $(DIRECTORY)/src/OSmesa/Makefile.in                             \
+       $(DIRECTORY)/src/OSmesa/Makefile.win                            \
+       $(DIRECTORY)/src/OSmesa/osmesa.def                              \
        $(DIRECTORY)/src/OSmesa/*.[ch]                                  \
        $(DIRECTORY)/src/SPARC/*.[chS]                                  \
        $(DIRECTORY)/src/SPARC/Makefile.am                              \
@@ -484,6 +489,8 @@ LIB_FILES = \
        $(DIRECTORY)/si-glu/Makefile.am                                 \
        $(DIRECTORY)/si-glu/Makefile.in                                 \
        $(DIRECTORY)/si-glu/Makefile.X11                                \
+       $(DIRECTORY)/si-glu/Makefile.win                                \
+       $(DIRECTORY)/si-glu/glu.def                                     \
        $(DIRECTORY)/si-glu/dummy.cc                                    \
        $(DIRECTORY)/si-glu/descrip.mms                                 \
        $(DIRECTORY)/si-glu/mesaglu.opt                                 \