projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed a CI-mode spot light conformance failure, but still not clear why
[mesa.git] / Makefile.X11
diff --git a/Makefile.X11 b/Makefile.X11
index 7421432bf3a802dce563e1b91e1ca734acb2a476..7a53182e31cbd21b1ddb898059260fc6f39e3da0 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.27 2000/06/27 17:37:17 brianp Exp $
+# $Id: Makefile.X11,v 1.41 2001/01/23 23:29:15 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.3
+# Version:  3.5
 # 
 # Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
 # 
@@ -68,18 +68,16 @@ default:
 
        @echo "  make linux                for Linux systems, make shared .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"
@@ -139,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-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 \
@@ -162,6 +157,7 @@ sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
        if [ -d src      ] ; then touch src/depend      ; fi
        if [ -d src-glu  ] ; then touch src-glu/depend  ; fi
        if [ -d src-glut ] ; then touch src-glut/depend ; fi
+       if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
        if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
@@ -177,6 +173,7 @@ irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
        if [ -d src-glu  ] ; then touch src-glu/depend  ; fi
        if [ -d src-glut ] ; then touch src-glut/depend ; fi
        if [ -d src-glut ] ; then touch src-glut/depend ; fi
+       if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
        if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
@@ -192,6 +189,7 @@ irix6-64 irix6-64-dso:
        touch src/depend
        touch src-glu/depend
        if [ -d src-glut ] ; then touch src-glut/depend ; fi
+       if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
        if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
@@ -226,6 +224,7 @@ cygnus cygnus-linux:
        -mkdir lib
        touch src/depend
        touch src-glu/depend
+       if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
        if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
@@ -264,6 +263,7 @@ linux-ggi linux-386-ggi:
        touch src/depend
        touch src-glu/depend
        if [ -d src-glut        ] ; then touch src-glut/depend ; fi
+       if [ -d widgets-sgi     ] ; then touch widgets-sgi/depend ; fi
        if [ -d ggi             ] ; then touch ggi/depend      ; fi
        if [ -d src             ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src/GGI/default ] ; then cd src/GGI/default ; $(MAKE)      ; fi
@@ -321,10 +321,10 @@ realclean: clean
 
 
 
-DIRECTORY = Mesa-3.3
-LIB_NAME = MesaLib-3.3beta1
-DEMO_NAME = MesaDemos-3.3beta1
-GLU_NAME = MesaGLU-3.3beta1
+DIRECTORY = Mesa-3.5
+LIB_NAME = MesaLib-3.5
+DEMO_NAME = MesaDemos-3.5
+GLU_NAME = MesaGLU-3.5
 GLUT_NAME = GLUT-3.7
 
 
@@ -345,7 +345,6 @@ LIB_FILES = \
        $(DIRECTORY)/missing                    \
        $(DIRECTORY)/mkinstalldirs              \
        $(DIRECTORY)/stamp-h.in                 \
-       $(DIRECTORY)/configure                  \
        $(DIRECTORY)/docs/CONFIG                \
        $(DIRECTORY)/docs/CONFORM               \
        $(DIRECTORY)/docs/COPYING               \
@@ -356,7 +355,7 @@ LIB_FILES = \
        $(DIRECTORY)/docs/INSTALL.GNU           \
        $(DIRECTORY)/docs/README                \
        $(DIRECTORY)/docs/README.*              \
-       $(DIRECTORY)/docs/RELNOTES              \
+       $(DIRECTORY)/docs/RELNOTES*             \
        $(DIRECTORY)/docs/VERSIONS              \
        $(DIRECTORY)/docs/*.spec                \
        $(DIRECTORY)/bin/README                 \
@@ -370,7 +369,7 @@ LIB_FILES = \
        $(DIRECTORY)/mesawin32.mak              \
        $(DIRECTORY)/Names.win                  \
        $(DIRECTORY)/win32-openstep.sh          \
-       $(DIRECTORY)/*.dja                      \
+       $(DIRECTORY)/common.dja                 \
        $(DIRECTORY)/include/GL/Makefile.in     \
        $(DIRECTORY)/include/GL/Makefile.am     \
        $(DIRECTORY)/include/GL/dosmesa.h       \
@@ -384,6 +383,7 @@ LIB_FILES = \
        $(DIRECTORY)/include/GL/glu_mangle.h    \
        $(DIRECTORY)/include/GL/glx.h           \
        $(DIRECTORY)/include/GL/glx_mangle.h    \
+       $(DIRECTORY)/include/GL/mesa_wgl.h      \
        $(DIRECTORY)/include/GL/mglmesa.h       \
        $(DIRECTORY)/include/GL/osmesa.h        \
        $(DIRECTORY)/include/GL/svgamesa.h      \
@@ -401,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              \
@@ -459,15 +467,12 @@ 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/*.dja                                  \
        $(DIRECTORY)/src-glu/README[12]                         \
        $(DIRECTORY)/src-glu/Makefile*                          \
        $(DIRECTORY)/src-glu/descrip.mms                        \
        $(DIRECTORY)/src-glu/mms_depend                         \
        $(DIRECTORY)/src-glu/*.def                              \
-       $(DIRECTORY)/src-glu/*.dja                              \
        $(DIRECTORY)/src-glu/depend                             \
        $(DIRECTORY)/src-glu/*.[ch]                             \
        $(DIRECTORY)/widgets-mesa/ChangeLog                     \
@@ -476,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                      \
@@ -492,8 +498,8 @@ LIB_FILES = \
        $(DIRECTORY)/widgets-mesa/man/Makefile.in               \
        $(DIRECTORY)/widgets-mesa/man/Mesa*                     \
        $(DIRECTORY)/widgets-mesa/src/ChangeLog                 \
-       $(DIRECTORY)/widgets-mesa/*.[ch]                        \
-       $(DIRECTORY)/widgets-mesa/Makefile.in                   \
+       $(DIRECTORY)/widgets-mesa/src/*.c                       \
+       $(DIRECTORY)/widgets-mesa/src/Makefile.in               \
        $(DIRECTORY)/widgets-sgi/*.[ch]                         \
        $(DIRECTORY)/widgets-sgi/Makefile*                      \
        $(DIRECTORY)/widgets-sgi/README                         \
@@ -560,7 +566,6 @@ DEMO_FILES =        \
        $(DIRECTORY)/samples/Makefile*          \
        $(DIRECTORY)/samples/README             \
        $(DIRECTORY)/samples/*.c                \
-       $(DIRECTORY)/samples/*.dja              \
        $(DIRECTORY)/mtdemos                    \
        $(DIRECTORY)/ggi
 
@@ -578,7 +583,6 @@ GLU_FILES = \
        $(DIRECTORY)/src-glu/descrip.mms        \
        $(DIRECTORY)/src-glu/mms_depend         \
        $(DIRECTORY)/src-glu/*.def              \
-       $(DIRECTORY)/src-glu/*.dja              \
        $(DIRECTORY)/src-glu/depend             \
        $(DIRECTORY)/src-glu/*.[ch]
 
@@ -635,14 +639,14 @@ glut_tar:
 
 
 lib_zip:
+       -rm $(LIB_NAME).zip ; \
        cp Makefile.X11 Makefile ; \
-       -rm $(LIB_NAME).zip
        cd .. ; \
        zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
        mv $(LIB_NAME).zip $(DIRECTORY)
 
 demo_zip:
-       -rm $(DEMO_NAME).zip
+       -rm $(DEMO_NAME).zip ; \
        cd .. ; \
        zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
        mv $(DEMO_NAME).zip $(DIRECTORY)