From: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu, 6 Dec 2007 01:23:00 +0000 (-0800)
Subject: autoconf: Include necessary files for the tarballs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72796238f86a5a1d964ed25572b69cee311e38c2;p=mesa.git

autoconf: Include necessary files for the tarballs

Add targets to the top Makefile so that configure and the necessary
scripts are added to the tarball for distribution.

Variables are used for autoconf and aclocal in case anyone needs to use
a specific version or pass any extra flags.
---

diff --git a/Makefile b/Makefile
index 97575efe02d..c73117866e3 100644
--- a/Makefile
+++ b/Makefile
@@ -176,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]*					\
@@ -436,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 ; \
@@ -447,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 ; \
@@ -466,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 ; \
@@ -485,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) ; \