added a cast
[mesa.git] / Makefile.X11
index 04ef2c7341423cb485a37067dc663de081147408..94ef10a7a7a808c3c258a9662fa94c5d02fff939 100644 (file)
@@ -1,9 +1,9 @@
-# $Id: Makefile.X11,v 1.68 2002/11/13 02:34:53 brianp Exp $
+# $Id: Makefile.X11,v 1.76 2003/04/07 14:45:52 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  5.0
+# 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"),
@@ -47,6 +47,7 @@ default:
        @echo "  make freebsd              for FreeBSD systems with GCC"
        @echo "  make freebsd-386          for FreeBSD systems with GCC, w/ Intel assembly"
        @echo "  make gcc                  for a generic system with GCC"
+       @echo "  make gcc-sl               for a generic system with GCC for shared libs"
        @echo "  make hpux9                for HP systems with HPUX 9.x"
        @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"
@@ -69,7 +70,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"
@@ -139,7 +139,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 darwin dgux freebsd freebsd-386 gcc \
+aix aix-sl amix bsdos bsdos4 darwin dgux freebsd freebsd-386 gcc gcc-sl \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 irix4 irix5 irix5-gcc irix5-dso \
@@ -173,6 +173,9 @@ sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
        if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
+gcc-mesa-sl:
+       if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
+
 irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
        -mkdir lib32
        if [ -d src      ] ; then touch src/depend      ; fi
@@ -188,6 +191,7 @@ irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
        if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
+CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
 
 irix6-64 irix6-64-dso:
        -mkdir lib64
@@ -204,10 +208,18 @@ irix6-64 irix6-64-dso:
        if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
+CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
 
 amiwin:
        bin/mklib.amiwin
 
+# Make an optional library with _just_ core objects
+libmesa:       $(LIBDIR)/$(MESA_LIB)
+       if [ ${MESA_LIB} ] ; then $(MAKELIB) $(MESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(CORE_OBJECTS) ; fi
+       if [ ${MESA_LIB} ] ; then rm -f $(LIBDIR)/$(MESA_LIB)* ; fi
+       if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi
+
+$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
 
 beos-r4:
        -mkdir lib
@@ -329,13 +341,27 @@ realclean: clean
        cd book        && $(MAKE) -f Makefile.X11 realclean || true
        cd samples     && $(MAKE) -f Makefile.X11 realclean || true
 
-
-DIRECTORY = Mesa-5.0
-LIB_NAME = MesaLib-5.0
-DEMO_NAME = MesaDemos-5.0
-GLU_NAME = MesaGLU-5.0
+# 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
 
+# Make an optional library with _just_ core objects
+libmesa:       $(LIBDIR)/$(MESA_LIB)
+       if [ ${MESA_LIB} ] ; then $(MAKELIB) $(MESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(CORE_OBJECTS) ; fi
+       if [ ${MESA_LIB} ] ; then rm -f $(LIBDIR)/$(MESA_LIB)* ; fi
+       if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi
+
+$(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS)
 
 LIB_FILES =    \
        $(DIRECTORY)/Makefile*                                          \
@@ -354,12 +380,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                                        \
@@ -431,7 +456,7 @@ LIB_FILES = \
        $(DIRECTORY)/src/windml/man3/*.3                                \
        $(DIRECTORY)/src/windml/man3/*.html                             \
        $(DIRECTORY)/src/DOS/*.[chS]                                    \
-       $(DIRECTORY)/src/DOS/vesa/*.[ch]                                \
+       $(DIRECTORY)/src/DOS/mga/*.[ch]                                 \
        $(DIRECTORY)/src/BeOS/*.cpp                                     \
        $(DIRECTORY)/src/FX/Makefile.am                                 \
        $(DIRECTORY)/src/FX/Makefile.in                                 \
@@ -472,9 +497,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                                  \
@@ -488,6 +510,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                                 \
@@ -707,33 +730,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 ; \
@@ -748,20 +769,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)