projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mesa: display list clean-ups
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index df0a0e91e3d648dd09871aa5b5425d437fdb1e34..840b41464fd2cc5dc99568e213854dabf40db354 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,16 +17,16 @@ doxygen:
        cd doxygen && $(MAKE)
 
 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:
-       touch $(TOP)/configs/current
-       $(MAKE) clean
+realclean: clean
        -rm -rf lib*
        -rm -f $(TOP)/configs/current
        -rm -f $(TOP)/configs/autoconf
@@ -48,15 +48,7 @@ install:
 linux-directfb-install:
        cd src/mesa/drivers/directfb && $(MAKE) install
 
-# Xserver GLcore module
-glcore:
-       cd src/mesa/drivers/xorg && $(MAKE)
-
-glcore-install:
-       cd src/mesa/drivers/xorg && $(MAKE) install
-
-.PHONY: default doxygen clean realclean install linux-directfb-install \
-       glcore glcore-install
+.PHONY: default doxygen clean realclean install linux-directfb-install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -182,15 +174,16 @@ 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.5-devel
+LIB_NAME = MesaLib-7.5-devel
+DEMO_NAME = MesaDemos-7.5-devel
+GLUT_NAME = MesaGLUT-7.5-devel
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
        $(DIRECTORY)/configure                                          \
        $(DIRECTORY)/configure.ac                                       \
+       $(DIRECTORY)/acinclude.m4                                       \
        $(DIRECTORY)/aclocal.m4                                         \
        $(DIRECTORY)/descrip.mms                                        \
        $(DIRECTORY)/mms-config.                                        \
@@ -199,6 +192,7 @@ MAIN_FILES = \
        $(DIRECTORY)/bin/install-sh                                     \
        $(DIRECTORY)/bin/mklib                                          \
        $(DIRECTORY)/bin/minstall                                       \
+       $(DIRECTORY)/bin/version.mk                                     \
        $(DIRECTORY)/configs/[a-z]*                                     \
        $(DIRECTORY)/docs/*.html                                        \
        $(DIRECTORY)/docs/COPYING                                       \
@@ -206,9 +200,7 @@ MAIN_FILES = \
        $(DIRECTORY)/docs/RELNOTES*                                     \
        $(DIRECTORY)/docs/*.spec                                        \
        $(DIRECTORY)/include/GL/internal/glcore.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                                    \
        $(DIRECTORY)/include/GL/glext.h                                 \
@@ -223,19 +215,15 @@ MAIN_FILES = \
        $(DIRECTORY)/include/GL/mglmesa.h                               \
        $(DIRECTORY)/include/GL/osmesa.h                                \
        $(DIRECTORY)/include/GL/svgamesa.h                              \
-       $(DIRECTORY)/include/GL/ugl*.h                                  \
        $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
-       $(DIRECTORY)/include/GL/xmesa.h                                 \
-       $(DIRECTORY)/include/GL/xmesa_x.h                               \
-       $(DIRECTORY)/include/GL/xmesa_xf86.h                            \
-       $(DIRECTORY)/include/GLView.h                                   \
        $(DIRECTORY)/src/Makefile                                       \
        $(DIRECTORY)/src/descrip.mms                                    \
        $(DIRECTORY)/src/mesa/Makefile*                                 \
        $(DIRECTORY)/src/mesa/sources                                   \
        $(DIRECTORY)/src/mesa/descrip.mms                               \
        $(DIRECTORY)/src/mesa/gl.pc.in                                  \
+       $(DIRECTORY)/src/mesa/osmesa.pc.in                              \
        $(DIRECTORY)/src/mesa/depend                                    \
        $(DIRECTORY)/src/mesa/main/*.[chS]                              \
        $(DIRECTORY)/src/mesa/main/descrip.mms                          \
@@ -264,6 +252,7 @@ MAIN_FILES = \
        $(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]                     \
@@ -271,6 +260,7 @@ MAIN_FILES = \
        $(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]                        \
@@ -280,6 +270,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                 \
@@ -287,8 +278,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/*.[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                              \
@@ -304,25 +298,19 @@ MAIN_FILES = \
        $(DIRECTORY)/vms/analyze_map.com                                \
        $(DIRECTORY)/vms/xlib.opt                                       \
        $(DIRECTORY)/vms/xlib_share.opt                                 \
-       $(DIRECTORY)/windows/VC8/mesa/mesa.sln                          \
-       $(DIRECTORY)/windows/VC8/mesa/gdi/gdi.vcproj                    \
-       $(DIRECTORY)/windows/VC8/mesa/glu/glu.vcproj                    \
-       $(DIRECTORY)/windows/VC8/mesa/mesa/mesa.vcproj                  \
-       $(DIRECTORY)/windows/VC8/mesa/osmesa/osmesa.vcproj              \
-       $(DIRECTORY)/windows/VC8/progs/progs.sln                        \
-       $(DIRECTORY)/windows/VC8/progs/demos/gears.vcproj               \
-       $(DIRECTORY)/windows/VC8/progs/glut/glut.vcproj
+       $(DIRECTORY)/windows/VC8/
 
 
 DRI_FILES = \
        $(DIRECTORY)/include/GL/internal/dri_interface.h                \
-       $(DIRECTORY)/include/GL/internal/dri_sarea.h                    \
+       $(DIRECTORY)/include/GL/internal/glcore.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]                     \
@@ -341,6 +329,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                 \
@@ -396,7 +386,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                 \
@@ -455,9 +446,9 @@ ACLOCAL = aclocal
 ACLOCAL_FLAGS =
 AUTOCONF = autoconf
 AC_FLAGS =
-aclocal.m4: configure.ac
+aclocal.m4: configure.ac acinclude.m4
        $(ACLOCAL) $(ACLOCAL_FLAGS)
-configure: configure.ac aclocal.m4
+configure: configure.ac aclocal.m4 acinclude.m4
        $(AUTOCONF) $(AC_FLAGS)
 
 rm_depend: