X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile;h=74784888981b79b4ce1ee230414aeade22458374;hb=48d65aabbc1e679fbf56fb7c4f7d4d702d43501a;hp=adaf03c3b962de73dd804549c84d92135a2d8ece;hpb=bcf4ae7816bcb4c9f7f39c9a8117c1ad440564e9;p=mesa.git diff --git a/Makefile b/Makefile index adaf03c3b96..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,49 +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.5 -LIB_NAME = MesaLib-6.5 -DEMO_NAME = MesaDemos-6.5 -GLUT_NAME = MesaGLUT-6.5 +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/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 \ @@ -166,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 \ @@ -185,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 \ @@ -211,6 +240,7 @@ 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] \ @@ -231,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] \ @@ -269,7 +300,6 @@ DRI_FILES = \ $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ $(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/*/*.[chS] \ $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ @@ -360,11 +390,15 @@ GLUT_FILES = \ $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \ $(DIRECTORY)/src/glut/ggi/*.[ch] \ $(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