X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile;h=a7091f51036afa14d6c7d648bbbaf315fd818654;hb=0174d894ef79aa5d6f093af8c5c6f97a5edd4e86;hp=801f1cbe9263bf78995fd815db47721b990709b0;hpb=3e36986e5a59c734b7bd198a16fb9af3314860de;p=mesa.git diff --git a/Makefile b/Makefile index 801f1cbe926..a7091f51036 100644 --- a/Makefile +++ b/Makefile @@ -55,11 +55,14 @@ $(TOP)/configs/current: # Rules to set/install a specific build configuration aix \ aix-64 \ +aix-64-static \ aix-gcc \ aix-static \ beos \ darwin \ darwin-static \ +darwin-static-x86ppc \ +darwin-x86ppc \ freebsd \ freebsd-dri \ freebsd-dri-amd64 \ @@ -72,6 +75,8 @@ hpux11-32-static \ hpux11-32-static-nothreads \ hpux11-64 \ hpux11-64-static \ +hpux11-ia64 \ +hpux11-ia64-static \ hpux9 \ hpux9-gcc \ irix6-64 \ @@ -89,8 +94,12 @@ linux-dri \ linux-dri-x86 \ linux-dri-x86-64 \ linux-dri-ppc \ +linux-dri-xcb \ +linux-indirect \ linux-fbdev \ linux-glide \ +linux-ia64-icc \ +linux-ia64-icc-static \ linux-icc \ linux-icc-static \ linux-osmesa16 \ @@ -112,12 +121,12 @@ linux-x86-32 \ linux-x86-64 \ linux-x86-64-debug \ linux-x86-64-static \ -linux-x86-xcb \ linux-x86-glide \ linux-x86-static \ netbsd \ openbsd \ osf1 \ +osf1-static \ solaris-x86 \ solaris-x86-gcc \ sunos4 \ @@ -125,7 +134,12 @@ sunos4-gcc \ sunos4-static \ sunos5 \ sunos5-gcc \ +sunos5-64-gcc \ sunos5-smp \ +sunos5-v8 \ +sunos5-v8-static \ +sunos5-v9 \ +sunos5-v9-static \ ultrix-gcc: (cd configs && rm -f current && ln -s $@ current) $(MAKE) default @@ -133,9 +147,10 @@ ultrix-gcc: # Rules for making release tarballs -DIRECTORY = Mesa-6.3.1 -LIB_NAME = MesaLib-6.3.1 -DEMO_NAME = MesaDemos-6.3.1 +DIRECTORY = Mesa-6.5.1 +LIB_NAME = MesaLib-6.5.1 +DEMO_NAME = MesaDemos-6.5.1 +GLUT_NAME = MesaGLUT-6.5.1 MAIN_FILES = \ $(DIRECTORY)/Makefile* \ @@ -151,8 +166,9 @@ MAIN_FILES = \ $(DIRECTORY)/docs/VERSIONS \ $(DIRECTORY)/docs/*.spec \ $(DIRECTORY)/include/GL/internal/glcore.h \ - $(DIRECTORY)/include/GL/dmesa.h \ $(DIRECTORY)/include/GL/amesa.h \ + $(DIRECTORY)/include/GL/dmesa.h \ + $(DIRECTORY)/include/GL/directfbgl.h \ $(DIRECTORY)/include/GL/fxmesa.h \ $(DIRECTORY)/include/GL/ggimesa.h \ $(DIRECTORY)/include/GL/gl.h \ @@ -163,6 +179,7 @@ MAIN_FILES = \ $(DIRECTORY)/include/GL/glx.h \ $(DIRECTORY)/include/GL/glxext.h \ $(DIRECTORY)/include/GL/glx_mangle.h \ + $(DIRECTORY)/include/GL/glfbdev.h \ $(DIRECTORY)/include/GL/mesa_wgl.h \ $(DIRECTORY)/include/GL/mglmesa.h \ $(DIRECTORY)/include/GL/osmesa.h \ @@ -211,7 +228,6 @@ MAIN_FILES = \ $(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 \ $(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \ @@ -258,18 +274,16 @@ MAIN_FILES = \ $(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj DRI_FILES = \ - $(DIRECTORY)/include/GL/internal/*.h \ + $(DIRECTORY)/include/GL/internal/dri_interface.h \ + $(DIRECTORY)/include/GL/internal/sarea.h \ $(DIRECTORY)/src/glx/Makefile \ $(DIRECTORY)/src/glx/x11/Makefile \ $(DIRECTORY)/src/glx/x11/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ - $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \ - $(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h \ - $(DIRECTORY)/src/mesa/drivers/dri/*/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/dri/*/depend \ + $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \ $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] @@ -311,7 +325,7 @@ GLW_FILES = \ $(DIRECTORY)/src/glw/README \ $(DIRECTORY)/src/glw/depend -PROG_FILES = \ +DEMO_FILES = \ $(DIRECTORY)/progs/beos/*.cpp \ $(DIRECTORY)/progs/beos/Makefile \ $(DIRECTORY)/progs/images/*.rgb \ @@ -322,6 +336,8 @@ PROG_FILES = \ $(DIRECTORY)/progs/demos/*.cxx \ $(DIRECTORY)/progs/demos/*.dat \ $(DIRECTORY)/progs/demos/README \ + $(DIRECTORY)/progs/osdemos/Makefile \ + $(DIRECTORY)/progs/osdemos/*.c \ $(DIRECTORY)/progs/xdemos/Makefile* \ $(DIRECTORY)/progs/xdemos/descrip.mms \ $(DIRECTORY)/progs/xdemos/*.[chf] \ @@ -336,10 +352,8 @@ PROG_FILES = \ $(DIRECTORY)/progs/windml/*.bmp \ $(DIRECTORY)/progs/ggi/*.c \ $(DIRECTORY)/windows/VC6/progs/demos/*.dsp \ - $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \ $(DIRECTORY)/windows/VC6/progs/progs.dsw \ $(DIRECTORY)/windows/VC7/progs/demos/*.vcproj \ - $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj \ $(DIRECTORY)/windows/VC7/progs/progs.sln GLUT_FILES = \ @@ -358,7 +372,9 @@ GLUT_FILES = \ $(DIRECTORY)/src/glut/dos/Makefile.DJ \ $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \ $(DIRECTORY)/src/glut/ggi/*.[ch] \ - $(DIRECTORY)/src/glut/ggi/Makefile + $(DIRECTORY)/src/glut/ggi/Makefile \ + $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \ + $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj DEPEND_FILES = \ $(TOP)/src/mesa/depend \ @@ -369,11 +385,9 @@ DEPEND_FILES = \ LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES) -DEMO_FILES = $(PROG_FILES) $(GLUT_FILES) - # Everything for new a Mesa release: -tarballs: rm_depend lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5 +tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5 rm_depend: @@ -395,6 +409,12 @@ demo_gz: gzip $(DEMO_NAME).tar ; \ mv $(DEMO_NAME).tar.gz $(DIRECTORY) +glut_gz: + cd .. ; \ + tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ + gzip $(GLUT_NAME).tar ; \ + mv $(GLUT_NAME).tar.gz $(DIRECTORY) + lib_bz2: rm -f configs/current ; \ cd .. ; \ @@ -408,6 +428,12 @@ demo_bz2: bzip2 $(DEMO_NAME).tar ; \ mv $(DEMO_NAME).tar.bz2 $(DIRECTORY) +glut_bz2: + cd .. ; \ + tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \ + bzip2 $(GLUT_NAME).tar ; \ + mv $(GLUT_NAME).tar.bz2 $(DIRECTORY) + lib_zip: rm -f configs/current ; \ rm -f $(LIB_NAME).zip ; \ @@ -421,6 +447,12 @@ demo_zip: zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \ mv $(DEMO_NAME).zip $(DIRECTORY) +glut_zip: + rm -f $(GLUT_NAME).zip ; \ + cd .. ; \ + zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \ + mv $(GLUT_NAME).zip $(DIRECTORY) + md5: @-md5sum $(LIB_NAME).tar.gz @-md5sum $(LIB_NAME).tar.bz2 @@ -428,3 +460,6 @@ md5: @-md5sum $(DEMO_NAME).tar.gz @-md5sum $(DEMO_NAME).tar.bz2 @-md5sum $(DEMO_NAME).zip + @-md5sum $(GLUT_NAME).tar.gz + @-md5sum $(GLUT_NAME).tar.bz2 + @-md5sum $(GLUT_NAME).zip