Mesa (master): automake: Directly generate configs/ current instead of symlinking from it.
Eric Anholt
anholt at kemper.freedesktop.org
Thu Jun 21 17:20:40 UTC 2012
Module: Mesa
Branch: master
Commit: 9ff2709ca571dcfe2f80746e638ad9d0687031fa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ff2709ca571dcfe2f80746e638ad9d0687031fa
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jun 11 10:49:38 2012 -0700
automake: Directly generate configs/current instead of symlinking from it.
---
Makefile.am | 1 -
configs/{autoconf.in => current.in} | 0
configure.ac | 10 +---------
3 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9c9e9f6..8210fcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ clean-local:
distclean-local:
-rm -rf lib*
-rm -f $(top_builddir)/configs/current
- -rm -f $(top_builddir)/configs/autoconf
-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
-name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
diff --git a/configs/autoconf.in b/configs/current.in
similarity index 100%
rename from configs/autoconf.in
rename to configs/current.in
diff --git a/configure.ac b/configure.ac
index 3a930d8..a927f7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2142,7 +2142,7 @@ CFLAGS="$CFLAGS $USER_CFLAGS"
CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
dnl Substitute the config
-AC_CONFIG_FILES([configs/autoconf
+AC_CONFIG_FILES([configs/current
Makefile
src/Makefile
src/gallium/auxiliary/pipe-loader/Makefile
@@ -2183,14 +2183,6 @@ AC_CONFIG_FILES([configs/autoconf
src/mesa/drivers/dri/radeon/Makefile
src/mesa/drivers/dri/swrast/Makefile])
-dnl Replace the configs/current symlink
-AC_CONFIG_COMMANDS([configs],[
-if test -f configs/current || test -L configs/current; then
- rm -f configs/current
-fi
-ln -s autoconf configs/current
-])
-
dnl Sort the dirs alphabetically
GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`
GALLIUM_WINSYS_DIRS=`echo $GALLIUM_WINSYS_DIRS|tr " " "\n"|sort -u|tr "\n" " "`
More information about the mesa-commit
mailing list