fixed a bunch of g++ warnings/errors. Compiling with g++ can help find lots of poten...

[mesa.git] / Makefile.X11

diff --git a/Makefile.X11 b/Makefile.X11
index c2da7c96470065cdda4f0cbb7051f540e8ea8fa0..7a53182e31cbd21b1ddb898059260fc6f39e3da0 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.35 2000/09/15 19:44:39 brianp Exp $
+# $Id: Makefile.X11,v 1.41 2001/01/23 23:29:15 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -67,20 +67,17 @@ default:
        @echo "  make irix6-64-dso         for SGI systems with IRIX 6.x, make 64-bit DSOs"
 
        @echo "  make linux                for Linux systems, make shared .so libs"
-       @echo "  make linux-trace          for Linux systems, make shared trace .so libs"
        @echo "  make linux-static         for Linux systems, make static .a libs"
-       @echo "  make linux-386            for Linux on Intel, make shared .so libs"
-       @echo "  make linux-386-static     for Linux on Intel, make static .a libs"
+       @echo "  make linux-trace          for Linux systems, with API trace extension"
+       @echo "  make linux-x86            for Linux on Intel, make shared .so libs"
+       @echo "  make linux-x86-static     for Linux on Intel, make static .a libs"
        @echo "  make linux-ggi            for Linux systems with libggi"
        @echo "  make linux-386-ggi        for Linux systems with libggi w/ Intel assembly"
        @echo "  make linux-glide          for Linux w/ 3Dfx Glide driver"
        @echo "  make linux-386-glide      for Linux w/ 3Dfx Glide driver, Intel assembly"
        @echo "  make linux-386-opt-glide  for Linux with 3Dfx Voodoo1 for GLQuake"
        @echo "  make linux-386-opt-V2-glide  for Linux with 3Dfx Voodoo2 for GLQuake"
-       @echo "  make linux-3dnow          for Linux on AMD w/ 3DNow!"
-       @echo "  make linux-3dnow-glide    for Linux on AMD w/ 3DNow! for Glide"
-       @echo "  make linux-katmai         for Linux on PentiumIII w/ SSE"
-       @echo "  make linux-katmai-glide   for Linux on PentiumIII w/ SSE for Glide"
+       @echo "  make linux-x86-glide      for Linux w/ all x86 asm for Glide"
        @echo "  make linux-alpha          for Linux on Alpha systems"
        @echo "  make linux-alpha-static   for Linux on Alpha systems, static libs"
        @echo "  make linux-ppc            for Linux on PowerPC systems"
@@ -140,13 +137,10 @@ aix aix-sl amix bsdos bsdos4 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 \
-linux-static-debug linux-elf-debug linux-prof linux-glide-debug \
-linux linux-trace linux-static \
-linux-386 linux-386-static \
+linux linux-static linux-debug linux-static-debug linux-prof \
+linux-x86 linux-x86-static linux-x86-debug \
 linux-glide linux-386-glide linux-386-opt-glide \
-linux-386-opt-V2-glide \
-linux-3dnow linux-3dnow-glide \
-linux-katmai linux-katmai-glide \
+linux-386-opt-V2-glide linux-x86-glide linux-glide-debug linux-glide-prof \
 linux-alpha-static linux-alpha \
 linux-ppc-static linux-ppc \
 linux-sparc \
@@ -407,6 +401,14 @@ LIB_FILES =        \
        $(DIRECTORY)/src/*.def                  \
        $(DIRECTORY)/src/depend                 \
        $(DIRECTORY)/src/*.[chS]                \
+       $(DIRECTORY)/src/math/*.[ch]            \
+       $(DIRECTORY)/src/math/Makefile*         \
+       $(DIRECTORY)/src/swrast/*.[ch]          \
+       $(DIRECTORY)/src/swrast/Makefile*       \
+       $(DIRECTORY)/src/swrast_setup/*.[ch]    \
+       $(DIRECTORY)/src/swrast_setup/Makefile* \
+       $(DIRECTORY)/src/tnl/*.[ch]             \
+       $(DIRECTORY)/src/tnl/Makefile*          \
        $(DIRECTORY)/src/Allegro/*.[ch]         \
        $(DIRECTORY)/src/BeOS/*.cpp             \
        $(DIRECTORY)/src/D3D/*.cpp              \
@@ -465,7 +467,6 @@ LIB_FILES = \
        $(DIRECTORY)/src/X86/*.[ch]                             \
        $(DIRECTORY)/src/X86/Makefile.am                        \
        $(DIRECTORY)/src/X86/Makefile.in                        \
-       $(DIRECTORY)/src/X86/*.m4                               \
        $(DIRECTORY)/src/X86/*.S                                \
        $(DIRECTORY)/src-glu/README[12]                         \
        $(DIRECTORY)/src-glu/Makefile*                          \
@@ -480,6 +481,7 @@ LIB_FILES = \
        $(DIRECTORY)/widgets-mesa/README                        \
        $(DIRECTORY)/widgets-mesa/TODO                          \
        $(DIRECTORY)/widgets-mesa/configure                     \
+       $(DIRECTORY)/widgets-mesa/configure.in                  \
        $(DIRECTORY)/widgets-mesa/demos/ChangeLog               \
        $(DIRECTORY)/widgets-mesa/demos/Cube                    \
        $(DIRECTORY)/widgets-mesa/demos/Ed                      \