projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert "[i965] make stipple pattern continue across GL_LINE_LOOP and GL_LINE_STRIP"
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index 60a14665cca1ad4e1a2661b589db7946a2b00188..df8e6a8ab88e3244d47d5f75909d530e5a86f49e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,8 @@ realclean:
        $(MAKE) clean
        -rm -rf lib*
        -rm -f $(TOP)/configs/current
+       -rm -f $(TOP)/configs/autoconf
+       -rm -rf autom4te.cache
        -rm -f `find . -name \*.o`
        -rm -f `find . -name \*.a`
        -rm -f `find . -name \*.so`
@@ -66,11 +68,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 \
@@ -151,8 +158,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
@@ -169,8 +177,14 @@ GLUT_NAME = MesaGLUT-7.1pre
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
+       $(DIRECTORY)/configure                                          \
+       $(DIRECTORY)/configure.ac                                       \
+       $(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)/configs/[a-z]*                                     \
@@ -209,6 +223,7 @@ 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                          \
@@ -288,17 +303,6 @@ MAIN_FILES = \
        $(DIRECTORY)/vms/analyze_map.com                                \
        $(DIRECTORY)/vms/xlib.opt                                       \
        $(DIRECTORY)/vms/xlib_share.opt                                 \
-       $(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp                       \
-       $(DIRECTORY)/windows/VC6/mesa/glu/*.txt                         \
-       $(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp                       \
-       $(DIRECTORY)/windows/VC6/mesa/mesa.dsw                          \
-       $(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp                     \
-       $(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp                 \
-       $(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj                    \
-       $(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj                    \
-       $(DIRECTORY)/windows/VC7/mesa/mesa.sln                          \
-       $(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj                  \
-       $(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj              \
        $(DIRECTORY)/windows/VC8/mesa/mesa.sln                          \
        $(DIRECTORY)/windows/VC8/mesa/gdi/gdi.vcproj                    \
        $(DIRECTORY)/windows/VC8/mesa/glu/glu.vcproj                    \
@@ -311,6 +315,7 @@ 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                               \
@@ -327,7 +332,9 @@ 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                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.DJ                            \
        $(DIRECTORY)/src/glu/sgi/glu.def                                \
@@ -359,6 +366,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 = \
@@ -402,6 +410,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            \
@@ -417,6 +426,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
 
@@ -432,9 +445,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
+       $(ACLOCAL) $(ACLOCAL_FLAGS)
+configure: configure.ac aclocal.m4
+       $(AUTOCONF) $(AC_FLAGS)
+
 rm_depend:
        @for dep in $(DEPEND_FILES) ; do \
                rm -f $$dep ; \
@@ -443,6 +467,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 ; \
@@ -462,6 +487,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 ; \
@@ -481,6 +507,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) ; \