fix some BCOMP/ACOMP typos (fixes Brad King's vtk failures)

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index c27e2c9037a78c93b7eb7d19e8e9113b3235c770..80295daafb4750e1f50c2c7b4c9bcfcff0a3eafc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,19 @@ realclean:
        $(MAKE) clean
        -rm -rf lib*
        -rm -f $(TOP)/configs/current
+       -rm -f `find . -name \*.o`
+       -rm -f `find . -name \*.a`
+       -rm -f `find . -name \*.so`
+
 
 
 install:
        @echo "Installing"
-       $(TOP)/bin/installmesa 
+       $(TOP)/bin/installmesa $(DESTDIR)
+
+# DirectFBGL module installation
+linux-directfb-install:
+       cd src/mesa/drivers/directfb && $(MAKE) install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -45,17 +53,22 @@ $(TOP)/configs/current:
 
 # Rules to set/install a specific build configuration
 aix \
+aix-64 \
 aix-gcc \
 aix-static \
 beos \
 darwin \
 darwin-static \
 freebsd \
+freebsd-dri \
+freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
+hpux11-32 \
 hpux11-32-static \
 hpux11-32-static-nothreads \
+hpux11-64 \
 hpux11-64-static \
 hpux9 \
 hpux9-gcc \
@@ -69,9 +82,12 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
+linux-directfb \
 linux-dri \
 linux-dri-x86 \
 linux-dri-x86-64 \
+linux-dri-ppc \
+linux-fbdev \
 linux-glide \
 linux-icc \
 linux-icc-static \
@@ -90,8 +106,11 @@ linux-ultrasparc \
 linux-tcc \
 linux-x86 \
 linux-x86-debug \
+linux-x86-32 \
 linux-x86-64 \
+linux-x86-64-debug \
 linux-x86-64-static \
+linux-x86-xcb \
 linux-x86-glide \
 linux-x86-static \
 netbsd \
@@ -112,9 +131,9 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.2
-LIB_NAME = MesaLib-6.2
-DEMO_NAME = MesaDemos-6.2
+DIRECTORY = Mesa-6.3
+LIB_NAME = MesaLib-6.3
+DEMO_NAME = MesaDemos-6.3
 
 LIB_FILES =    \
        $(DIRECTORY)/Makefile*                                          \
@@ -126,7 +145,6 @@ LIB_FILES = \
        $(DIRECTORY)/configs/[a-z]*                                     \
        $(DIRECTORY)/docs/*.html                                        \
        $(DIRECTORY)/docs/COPYING                                       \
-       $(DIRECTORY)/docs/INSTALL.GNU                                   \
        $(DIRECTORY)/docs/README.*                                      \
        $(DIRECTORY)/docs/RELNOTES*                                     \
        $(DIRECTORY)/docs/VERSIONS                                      \
@@ -188,10 +206,11 @@ LIB_FILES =       \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]                         \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm                      \
        $(DIRECTORY)/src/mesa/drivers/beos/*.cpp                        \
-       $(DIRECTORY)/src/mesa/drivers/beos/*.h                          \
        $(DIRECTORY)/src/mesa/drivers/beos/Makefile                     \
        $(DIRECTORY)/src/mesa/drivers/common/*.[ch]                     \
        $(DIRECTORY)/src/mesa/drivers/common/descrip.mms                \
+       $(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]           \
+       $(DIRECTORY)/src/mesa/drivers/directfb/Makefile         \
        $(DIRECTORY)/src/mesa/drivers/dos/*.[chS]                       \
        $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]                 \
        $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c                   \
@@ -261,7 +280,7 @@ LIB_FILES = \
        $(DIRECTORY)/vms/xlib_share.opt
 
 
-DEMO_FILES =   \
+GLUT_FILES = \
        $(DIRECTORY)/include/GL/glut.h                  \
        $(DIRECTORY)/include/GL/glutf90.h               \
        $(DIRECTORY)/src/glut/glx/Makefile*             \
@@ -277,6 +296,11 @@ DEMO_FILES =       \
        $(DIRECTORY)/src/glut/dos/*.[ch]                \
        $(DIRECTORY)/src/glut/dos/Makefile.DJ           \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
+       $(DIRECTORY)/src/glut/ggi/*.[ch]                \
+       $(DIRECTORY)/src/glut/ggi/Makefile
+
+
+DEMO_FILES = \
        $(DIRECTORY)/progs/beos/*.cpp                   \
        $(DIRECTORY)/progs/beos/Makefile                \
        $(DIRECTORY)/progs/images/*.rgb                 \
@@ -333,7 +357,7 @@ lib_gz:
 
 demo_gz:
        cd .. ; \
-       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
        gzip $(DEMO_NAME).tar ; \
        mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 
@@ -346,7 +370,7 @@ lib_bz2:
 
 demo_bz2:
        cd .. ; \
-       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+       tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
        bzip2 $(DEMO_NAME).tar ; \
        mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 
@@ -360,7 +384,7 @@ lib_zip:
 demo_zip:
        -rm $(DEMO_NAME).zip ; \
        cd .. ; \
-       zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
+       zip -r $(DEMO_NAME).zip $(DEMO_FILES) $(GLUT_FILES) ; \
        mv $(DEMO_NAME).zip $(DIRECTORY)
 
 md5: