diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 104 |
1 files changed, 73 insertions, 31 deletions
@@ -18,26 +18,23 @@ all: default doxygen: cd doxygen && $(MAKE) -.PHONY: doxygen - - clean: - @for dir in $(SUBDIRS) ; do \ + -@touch $(TOP)/configs/current + -@for dir in $(SUBDIRS) ; do \ if [ -d $$dir ] ; then \ (cd $$dir && $(MAKE) clean) ; \ fi \ done + -@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current -realclean: - -rm -f `find . -name \*.o` - -rm -f `find . -name \*.a` - -rm -f `find . -name \*.so` - -rm -f `find . -name depend` - -rm -f `find . -name depend.bak` +realclean: clean -rm -rf lib* - $(MAKE) clean -rm -f $(TOP)/configs/current + -rm -f $(TOP)/configs/autoconf + -rm -rf autom4te.cache + -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \ + -name depend -o -name depend.bak ')' -exec rm -f '{}' ';' install: @@ -52,14 +49,20 @@ install: linux-directfb-install: cd src/mesa/drivers/directfb && $(MAKE) install +.PHONY: default doxygen clean realclean install linux-directfb-install + # If there's no current configuration file $(TOP)/configs/current: @echo @echo @echo "Please choose a configuration from the following list:" - @ls -1 $(TOP)/configs | grep -v "current\|default\|CVS" + @ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*" @echo @echo "Then type 'make <config>' (ex: 'make linux-x86')" + @echo + @echo "Or, run './configure' then 'make'" + @echo "See './configure --help' for details" + @echo @echo "(ignore the following error message)" @exit 1 @@ -70,11 +73,16 @@ aix-64 \ aix-64-static \ aix-gcc \ aix-static \ +autoconf \ +bluegene-osmesa \ +bluegene-xlc-osmesa \ beos \ +catamount-osmesa-pgi \ darwin \ +darwin-fat-32bit \ +darwin-fat-all \ darwin-static \ darwin-static-x86ppc \ -darwin-x86ppc \ freebsd \ freebsd-dri \ freebsd-dri-amd64 \ @@ -162,8 +170,9 @@ sunos5-v8 \ sunos5-v8-static \ sunos5-v9 \ sunos5-v9-static \ +sunos5-v9-cc-g++ \ ultrix-gcc: - @ if [ -e configs/current ] ; then \ + @ if test -f configs/current || test -L configs/current ; then \ echo "Please run 'make realclean' before changing configs" ; \ exit 1 ; \ fi @@ -173,17 +182,25 @@ ultrix-gcc: # Rules for making release tarballs -DIRECTORY = Mesa-7.1pre -LIB_NAME = MesaLib-7.1pre -DEMO_NAME = MesaDemos-7.1pre -GLUT_NAME = MesaGLUT-7.1pre +DIRECTORY = Mesa-7.1-rc4 +LIB_NAME = MesaLib-7.1-rc4 +DEMO_NAME = MesaDemos-7.1-rc4 +GLUT_NAME = MesaGLUT-7.1-rc4 MAIN_FILES = \ $(DIRECTORY)/Makefile* \ + $(DIRECTORY)/configure \ + $(DIRECTORY)/configure.ac \ + $(DIRECTORY)/acinclude.m4 \ + $(DIRECTORY)/aclocal.m4 \ $(DIRECTORY)/descrip.mms \ $(DIRECTORY)/mms-config. \ + $(DIRECTORY)/bin/config.guess \ + $(DIRECTORY)/bin/config.sub \ + $(DIRECTORY)/bin/install-sh \ $(DIRECTORY)/bin/mklib \ $(DIRECTORY)/bin/minstall \ + $(DIRECTORY)/bin/version.mk \ $(DIRECTORY)/configs/[a-z]* \ $(DIRECTORY)/docs/*.html \ $(DIRECTORY)/docs/COPYING \ @@ -220,51 +237,44 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/Makefile* \ $(DIRECTORY)/src/mesa/sources \ $(DIRECTORY)/src/mesa/descrip.mms \ + $(DIRECTORY)/src/mesa/gl.pc.in \ $(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/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/shader/slang/library/*.gc \ $(DIRECTORY)/src/mesa/shader/slang/library/*.syn \ $(DIRECTORY)/src/mesa/shader/slang/library/Makefile \ $(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/vbo/*.[chS] \ $(DIRECTORY)/src/mesa/vbo/descrip.mms \ $(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 \ + $(DIRECTORY)/src/mesa/drivers/Makefile \ $(DIRECTORY)/src/mesa/drivers/beos/*.cpp \ $(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/fbdev/Makefile \ $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c \ $(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \ @@ -274,6 +284,7 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/drivers/ggi/display/*.c \ $(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in \ $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h \ + $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile \ $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \ $(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms \ $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \ @@ -281,9 +292,11 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/windows/*/*.def \ + $(DIRECTORY)/src/mesa/drivers/x11/Makefile \ $(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \ - $(DIRECTORY)/src/mesa/drivers/x11/sources \ $(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/glslcompiler/Makefile \ + $(DIRECTORY)/src/mesa/drivers/glslcompiler/glslcompiler.c \ $(DIRECTORY)/src/mesa/ppc/*.[ch] \ $(DIRECTORY)/src/mesa/sparc/*.[chS] \ $(DIRECTORY)/src/mesa/x86/Makefile \ @@ -311,12 +324,14 @@ MAIN_FILES = \ DRI_FILES = \ $(DIRECTORY)/include/GL/internal/dri_interface.h \ + $(DIRECTORY)/include/GL/internal/dri_sarea.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/dri.pc.in \ $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \ $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \ $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \ @@ -327,6 +342,7 @@ DRI_FILES = \ SGI_GLU_FILES = \ $(DIRECTORY)/src/glu/Makefile \ $(DIRECTORY)/src/glu/descrip.mms \ + $(DIRECTORY)/src/glu/glu.pc.in \ $(DIRECTORY)/src/glu/sgi/Makefile \ $(DIRECTORY)/src/glu/sgi/Makefile.mgw \ $(DIRECTORY)/src/glu/sgi/Makefile.win \ @@ -334,6 +350,8 @@ SGI_GLU_FILES = \ $(DIRECTORY)/src/glu/sgi/glu.def \ $(DIRECTORY)/src/glu/sgi/dummy.cc \ $(DIRECTORY)/src/glu/sgi/descrip.mms \ + $(DIRECTORY)/src/glu/sgi/glu.exports \ + $(DIRECTORY)/src/glu/sgi/glu.exports.darwin \ $(DIRECTORY)/src/glu/sgi/mesaglu.opt \ $(DIRECTORY)/src/glu/sgi/include/gluos.h \ $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \ @@ -360,6 +378,7 @@ GLW_FILES = \ $(DIRECTORY)/src/glw/*.[ch] \ $(DIRECTORY)/src/glw/Makefile* \ $(DIRECTORY)/src/glw/README \ + $(DIRECTORY)/src/glw/glw.pc.in \ $(DIRECTORY)/src/glw/depend DEMO_FILES = \ @@ -388,7 +407,8 @@ DEMO_FILES = \ $(DIRECTORY)/progs/samples/*.c \ $(DIRECTORY)/progs/glsl/Makefile* \ $(DIRECTORY)/progs/glsl/*.c \ - $(DIRECTORY)/progs/glsl/*.txt \ + $(DIRECTORY)/progs/glsl/*.frag \ + $(DIRECTORY)/progs/glsl/*.vert \ $(DIRECTORY)/progs/windml/Makefile.ugl \ $(DIRECTORY)/progs/windml/*.c \ $(DIRECTORY)/progs/windml/*.bmp \ @@ -403,6 +423,7 @@ GLUT_FILES = \ $(DIRECTORY)/include/GL/glutf90.h \ $(DIRECTORY)/src/glut/glx/Makefile* \ $(DIRECTORY)/src/glut/glx/depend \ + $(DIRECTORY)/src/glut/glx/glut.pc.in \ $(DIRECTORY)/src/glut/glx/*def \ $(DIRECTORY)/src/glut/glx/descrip.mms \ $(DIRECTORY)/src/glut/glx/mms_depend \ @@ -418,6 +439,10 @@ GLUT_FILES = \ $(DIRECTORY)/src/glut/fbdev/Makefile \ $(DIRECTORY)/src/glut/fbdev/*[ch] \ $(DIRECTORY)/src/glut/mini/*[ch] \ + $(DIRECTORY)/src/glut/mini/glut.pc.in \ + $(DIRECTORY)/src/glut/directfb/Makefile \ + $(DIRECTORY)/src/glut/directfb/NOTES \ + $(DIRECTORY)/src/glut/directfb/*[ch] \ $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \ $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj @@ -433,9 +458,20 @@ LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES) # Everything for new a Mesa release: -tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5 +tarballs: rm_depend configure aclocal.m4 lib_gz demo_gz glut_gz \ + lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5 +# Helper for autoconf builds +ACLOCAL = aclocal +ACLOCAL_FLAGS = +AUTOCONF = autoconf +AC_FLAGS = +aclocal.m4: configure.ac acinclude.m4 + $(ACLOCAL) $(ACLOCAL_FLAGS) +configure: configure.ac aclocal.m4 acinclude.m4 + $(AUTOCONF) $(AC_FLAGS) + rm_depend: @for dep in $(DEPEND_FILES) ; do \ rm -f $$dep ; \ @@ -444,6 +480,7 @@ rm_depend: lib_gz: rm -f configs/current ; \ + rm -f configs/autoconf ; \ cd .. ; \ tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ gzip $(LIB_NAME).tar ; \ @@ -463,6 +500,7 @@ glut_gz: lib_bz2: rm -f configs/current ; \ + rm -f configs/autoconf ; \ cd .. ; \ tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \ bzip2 $(LIB_NAME).tar ; \ @@ -482,6 +520,7 @@ glut_bz2: lib_zip: rm -f configs/current ; \ + rm -f configs/autoconf ; \ rm -f $(LIB_NAME).zip ; \ cd .. ; \ zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \ @@ -509,3 +548,6 @@ md5: @-md5sum $(GLUT_NAME).tar.gz @-md5sum $(GLUT_NAME).tar.bz2 @-md5sum $(GLUT_NAME).zip + +.PHONY: tarballs rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 \ + glut_bz2 lib_zip demo_zip glut_zip md5 |