improve some error messages
[mesa.git] / Makefile.X11
index 28255e6ae6de9446aecfbf9a340116b1fb26f104..4ff44b450f7b9a58d14a6dfa32b7117379fab74c 100644 (file)
@@ -1,9 +1,9 @@
-# $Id: Makefile.X11,v 1.64 2002/09/19 16:36:52 brianp Exp $
+# $Id: Makefile.X11,v 1.75 2003/03/11 15:42:48 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  4.1
+# Version:  5.1
 # 
-# Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -51,8 +51,8 @@ default:
        @echo "  make hpux9-sl             for HP systems with HPUX 9.x, make shared libs"
        @echo "  make hpux9-gcc            for HP systems with HPUX 9.x using GCC"
        @echo "  make hpux9-gcc-sl         for HP systems with HPUX 9.x, GCC, make shared libs"
-       @echo "  make hpux10               for HP systems with HPUX 10.x"
-       @echo "  make hpux10-sl            for HP systems with HPUX 10.x, shared libs"
+       @echo "  make hpux10               for HP systems with HPUX 10.x and 11.x"
+       @echo "  make hpux10-sl            for HP systems with HPUX 10.x and 11.x, shared libs"
        @echo "  make hpux10-gcc           for HP systems with HPUX 10.x w/ GCC"
        @echo "  make hpux10-gcc-sl        for HP systems with HPUX 10.x w/ GCC, shared libs"
        @echo "  make irix4                for SGI systems with IRIX 4.x"
@@ -69,7 +69,6 @@ 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-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"
@@ -329,11 +328,18 @@ realclean: clean
        cd book        && $(MAKE) -f Makefile.X11 realclean || true
        cd samples     && $(MAKE) -f Makefile.X11 realclean || true
 
-
-DIRECTORY = Mesa-4.1
-LIB_NAME = MesaLib-4.1
-DEMO_NAME = MesaDemos-4.1
-GLU_NAME = MesaGLU-4.1
+# Remove everything not in CVS
+cvsclean: realclean
+       -rm -f acinclude.m4 aclocal.m4
+       -rm -f conf.h conf.h.in config.guess config.log config.status
+       -rm -f config.sub configure
+       -rm -f install-sh libtool ltmain.sh Makefile.in
+       -rm -f missing mkinstalldirs stamp-h stamp-h.in
+
+DIRECTORY = Mesa-5.1
+LIB_NAME = MesaLib-5.1
+DEMO_NAME = MesaDemos-5.1
+GLU_NAME = MesaGLU-5.1
 GLUT_NAME = GLUT-3.7
 
 
@@ -354,12 +360,11 @@ LIB_FILES =       \
        $(DIRECTORY)/missing                                            \
        $(DIRECTORY)/mkinstalldirs                                      \
        $(DIRECTORY)/stamp-h.in                                         \
-       $(DIRECTORY)/docs/CONFIG                                        \
+       $(DIRECTORY)/docs/index.html                                    \
        $(DIRECTORY)/docs/CONFORM                                       \
        $(DIRECTORY)/docs/COPYING                                       \
        $(DIRECTORY)/docs/COPYRIGHT                                     \
        $(DIRECTORY)/docs/DEVINFO                                       \
-       $(DIRECTORY)/docs/IAFA-PACKAGE                                  \
        $(DIRECTORY)/docs/INSTALL                                       \
        $(DIRECTORY)/docs/INSTALL.GNU                                   \
        $(DIRECTORY)/docs/README                                        \
@@ -400,7 +405,6 @@ LIB_FILES = \
        $(DIRECTORY)/include/GL/xmesa_x.h                               \
        $(DIRECTORY)/include/GL/xmesa_xf86.h                            \
        $(DIRECTORY)/include/GLView.h                                   \
-       $(DIRECTORY)/include/dmesadxe.h                                 \
        $(DIRECTORY)/include/Makefile.in                                \
        $(DIRECTORY)/include/Makefile.am                                \
        $(DIRECTORY)/src/Makefile*                                      \
@@ -432,8 +436,7 @@ LIB_FILES = \
        $(DIRECTORY)/src/windml/man3/*.3                                \
        $(DIRECTORY)/src/windml/man3/*.html                             \
        $(DIRECTORY)/src/DOS/*.[chS]                                    \
-       $(DIRECTORY)/src/DOS/vesa/*.[ch]                                \
-       $(DIRECTORY)/src/BeOS/*.h                                       \
+       $(DIRECTORY)/src/DOS/mga/*.[ch]                                 \
        $(DIRECTORY)/src/BeOS/*.cpp                                     \
        $(DIRECTORY)/src/FX/Makefile.am                                 \
        $(DIRECTORY)/src/FX/Makefile.in                                 \
@@ -474,9 +477,6 @@ LIB_FILES = \
        $(DIRECTORY)/src/SVGA/Makefile.am                               \
        $(DIRECTORY)/src/SVGA/Makefile.in                               \
        $(DIRECTORY)/src/SVGA/*.[ch]                                    \
-       $(DIRECTORY)/src/Trace/*.[ch]                                   \
-       $(DIRECTORY)/src/Trace/Makefile.am                              \
-       $(DIRECTORY)/src/Trace/Makefile.in                              \
        $(DIRECTORY)/src/Windows/*.[ch]                                 \
        $(DIRECTORY)/src/Windows/*.def                                  \
        $(DIRECTORY)/src/X/Makefile.am                                  \
@@ -490,6 +490,7 @@ LIB_FILES = \
        $(DIRECTORY)/si-glu/Makefile.in                                 \
        $(DIRECTORY)/si-glu/Makefile.X11                                \
        $(DIRECTORY)/si-glu/Makefile.win                                \
+       $(DIRECTORY)/si-glu/Makefile.DJ                                 \
        $(DIRECTORY)/si-glu/glu.def                                     \
        $(DIRECTORY)/si-glu/dummy.cc                                    \
        $(DIRECTORY)/si-glu/descrip.mms                                 \
@@ -626,7 +627,7 @@ DEMO_FILES =        \
        $(DIRECTORY)/demos/README               \
        $(DIRECTORY)/xdemos/Makefile*           \
        $(DIRECTORY)/xdemos/descrip.mms         \
-       $(DIRECTORY)/xdemos/*.[cf]              \
+       $(DIRECTORY)/xdemos/*.[chf]             \
        $(DIRECTORY)/book/Makefile*             \
        $(DIRECTORY)/book/README                \
        $(DIRECTORY)/book/*.[ch]                \
@@ -709,33 +710,31 @@ OBSOLETE_GLUT_FILES = \
        $(DIRECTORY)/src-glut.beos/*.h
 
 
-lib_tar:
+lib_gz:
        cp Makefile.X11 Makefile ; \
        cd .. ; \
        tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
        gzip $(LIB_NAME).tar ; \
        mv $(LIB_NAME).tar.gz $(DIRECTORY)
 
-demo_tar:
+demo_gz:
        cd .. ; \
        tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
        gzip $(DEMO_NAME).tar ; \
        mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 
-glu_tar:
+lib_bz2:
        cp Makefile.X11 Makefile ; \
        cd .. ; \
-       tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
-       gzip $(GLU_NAME).tar ; \
-       mv $(GLU_NAME).tar.gz $(DIRECTORY)
+       tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
+       bzip2 $(LIB_NAME).tar ; \
+       mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
 
-glut_tar:
-       cp Makefile.X11 Makefile ; \
+demo_bz2:
        cd .. ; \
-       tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
-       gzip $(GLUT_NAME).tar ; \
-       mv $(GLUT_NAME).tar.gz $(DIRECTORY)
-
+       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       bzip2 $(DEMO_NAME).tar ; \
+       mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 
 lib_zip:
        -rm $(LIB_NAME).zip ; \
@@ -750,20 +749,29 @@ demo_zip:
        zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
        mv $(DEMO_NAME).zip $(DIRECTORY)
 
+md5:
+       @-md5sum $(LIB_NAME).tar.gz
+       @-md5sum $(LIB_NAME).tar.bz2
+       @-md5sum $(LIB_NAME).zip
+       @-md5sum $(DEMO_NAME).tar.gz
+       @-md5sum $(DEMO_NAME).tar.bz2
+       @-md5sum $(DEMO_NAME).zip
 
+# Everything for new Mesa release:
+tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
 
-SRC_FILES =    \
-       RELNOTES                \
-       src/Makefile*           \
-       src/depend              \
-       src/*.[chS]             \
-       src/*/*.[ch]            \
-       include/GL/*.h
 
-srctar:
-       tar -cvf src.tar $(SRC_FILES) ; \
-       gzip src.tar
+# not used
+glu_gz:
+       cp Makefile.X11 Makefile ; \
+       cd .. ; \
+       tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
+       gzip $(GLU_NAME).tar ; \
+       mv $(GLU_NAME).tar.gz $(DIRECTORY)
 
-srctar.zip:
-       -rm src.zip
-       zip -r src.zip $(SRC_FILES) ; \
+glut_gz:
+       cp Makefile.X11 Makefile ; \
+       cd .. ; \
+       tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
+       gzip $(GLUT_NAME).tar ; \
+       mv $(GLUT_NAME).tar.gz $(DIRECTORY)