Merge branch 'autoconf2'

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index ef607f4944ce6db27fdf36270ee4e284ba6bcfeb..c73117866e32c08a129875df64124524547185d5 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,9 +68,11 @@ aix-64 \
 aix-64-static \
 aix-gcc \
 aix-static \
+autoconf \
 bluegene-osmesa \
 bluegene-xlc-osmesa \
 beos \
+catamount-osmesa-pgi \
 darwin \
 darwin-static \
 darwin-static-x86ppc \
@@ -172,8 +176,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]*                                     \
@@ -354,6 +364,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 = \
@@ -413,6 +424,9 @@ GLUT_FILES = \
        $(DIRECTORY)/src/glut/fbdev/Makefile            \
        $(DIRECTORY)/src/glut/fbdev/*[ch]               \
        $(DIRECTORY)/src/glut/mini/*[ch]                \
+       $(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
 
@@ -420,7 +434,6 @@ DEPEND_FILES = \
        $(TOP)/src/mesa/depend          \
        $(TOP)/src/glx/x11/depend       \
        $(TOP)/src/glw/depend           \
-       $(TOP)/src/glw/glw.pc.in        \
        $(TOP)/src/glut/glx/depend      \
        $(TOP)/src/glu/sgi/depend
 
@@ -429,9 +442,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 ; \
@@ -440,6 +464,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 ; \
@@ -459,6 +484,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 ; \
@@ -478,6 +504,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) ; \