X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=inline;f=Makefile;h=74784888981b79b4ce1ee230414aeade22458374;hb=27cc9068ce49ede4cb56d52b32c96e568e5fcbb5;hp=6de4d22d4a85bad1a7bb1c6bf2a45a20a38015f7;hpb=dc6e2c778aa0e67b68fa02043443bfad4dbbccbf;p=mesa.git diff --git a/Makefile b/Makefile index 6de4d22d4a8..74784888981 100644 --- a/Makefile +++ b/Makefile @@ -33,8 +33,9 @@ realclean: install: - @echo "Installing" - $(TOP)/bin/installmesa $(DESTDIR) + @for dir in $(SUBDIRS) ; do \ + (cd $$dir ; $(MAKE) install) || exit 1 ; \ + done # DirectFBGL module installation linux-directfb-install: @@ -55,11 +56,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 +76,8 @@ hpux11-32-static \ hpux11-32-static-nothreads \ hpux11-64 \ hpux11-64-static \ +hpux11-ia64 \ +hpux11-ia64-static \ hpux9 \ hpux9-gcc \ irix6-64 \ @@ -89,11 +95,15 @@ 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-osmesa \ linux-osmesa16 \ linux-osmesa16-static \ linux-osmesa32 \ @@ -113,47 +123,57 @@ 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 \ +solaris-x86-gcc-static \ sunos4 \ sunos4-gcc \ sunos4-static \ sunos5 \ sunos5-gcc \ +sunos5-64-gcc \ sunos5-smp \ +sunos5-v8 \ +sunos5-v8-static \ +sunos5-v9 \ +sunos5-v9-static \ ultrix-gcc: + @ if [ -e configs/current ] ; then \ + echo "Please run 'make realclean' before changing configs" ; \ + exit 1 ; \ + fi (cd configs && rm -f current && ln -s $@ current) $(MAKE) default # 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.2 +LIB_NAME = MesaLib-6.5.2 +DEMO_NAME = MesaDemos-6.5.2 +GLUT_NAME = MesaGLUT-6.5.2 MAIN_FILES = \ $(DIRECTORY)/Makefile* \ $(DIRECTORY)/descrip.mms \ $(DIRECTORY)/mms-config. \ $(DIRECTORY)/bin/mklib \ - $(DIRECTORY)/bin/installmesa \ + $(DIRECTORY)/bin/minstall \ $(DIRECTORY)/configs/[a-z]* \ $(DIRECTORY)/docs/*.html \ $(DIRECTORY)/docs/COPYING \ $(DIRECTORY)/docs/README.* \ $(DIRECTORY)/docs/RELNOTES* \ - $(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/fxmesa.h \ $(DIRECTORY)/include/GL/ggimesa.h \ $(DIRECTORY)/include/GL/gl.h \ @@ -164,6 +184,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 \ @@ -183,25 +204,35 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/depend \ $(DIRECTORY)/src/mesa/main/*.[chS] \ $(DIRECTORY)/src/mesa/main/descrip.mms \ + $(DIRECTORY)/src/mesa/main/sources \ $(DIRECTORY)/src/mesa/glapi/*.[chS] \ $(DIRECTORY)/src/mesa/glapi/descrip.mms \ + $(DIRECTORY)/src/mesa/glapi/sources \ $(DIRECTORY)/src/mesa/array_cache/*.[ch] \ $(DIRECTORY)/src/mesa/array_cache/descrip.mms \ + $(DIRECTORY)/src/mesa/array_cache/sources \ $(DIRECTORY)/src/mesa/math/*.[ch] \ $(DIRECTORY)/src/mesa/math/descrip.mms \ + $(DIRECTORY)/src/mesa/math/sources \ $(DIRECTORY)/src/mesa/shader/*.[ch] \ $(DIRECTORY)/src/mesa/shader/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/sources \ $(DIRECTORY)/src/mesa/shader/grammar/*.[ch] \ $(DIRECTORY)/src/mesa/shader/grammar/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/grammar/sources \ $(DIRECTORY)/src/mesa/shader/slang/*.[ch] \ $(DIRECTORY)/src/mesa/shader/slang/descrip.mms \ + $(DIRECTORY)/src/mesa/shader/slang/sources \ $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch] \ $(DIRECTORY)/src/mesa/swrast/*.[ch] \ $(DIRECTORY)/src/mesa/swrast/descrip.mms \ + $(DIRECTORY)/src/mesa/swrast/sources \ $(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \ $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \ + $(DIRECTORY)/src/mesa/swrast_setup/sources \ $(DIRECTORY)/src/mesa/tnl/*.[chS] \ $(DIRECTORY)/src/mesa/tnl/descrip.mms \ + $(DIRECTORY)/src/mesa/tnl/sources \ $(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \ $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \ $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm \ @@ -209,10 +240,10 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/drivers/beos/Makefile \ $(DIRECTORY)/src/mesa/drivers/common/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/common/descrip.mms \ + $(DIRECTORY)/src/mesa/drivers/common/sources \ $(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] \ @@ -230,6 +261,7 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/windows/*/*.def \ $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \ + $(DIRECTORY)/src/mesa/drivers/x11/sources \ $(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \ $(DIRECTORY)/src/mesa/ppc/*.[ch] \ $(DIRECTORY)/src/mesa/sparc/*.[chS] \ @@ -259,17 +291,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/*/*.[chS] \ $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] @@ -311,7 +342,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 +353,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 +369,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,10 +389,16 @@ 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)/src/glut/fbdev/Makefile \ + $(DIRECTORY)/src/glut/fbdev/*[ch] \ + $(DIRECTORY)/src/glut/mini/*[ch] \ + $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \ + $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj DEPEND_FILES = \ $(TOP)/src/mesa/depend \ + $(TOP)/src/glx/x11/depend \ $(TOP)/src/glw/depend \ $(TOP)/src/glut/glx/depend \ $(TOP)/src/glu/sgi/depend @@ -369,11 +406,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 +430,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 +449,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 +468,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 +481,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