diff options
| -rwxr-xr-x | acprep | 39 | ||||
| -rwxr-xr-x | tools/build | 7 |
2 files changed, 24 insertions, 22 deletions
@@ -8,29 +8,32 @@ # This script simply sets up the compiler and linker flags for all the various # build permutations I use for testing and profiling. -if [ -d .git ]; then - # Make sure that all of the dependencies are available - git submodule init - git submodule update - - COMMIT=$(git describe --all --long | sed 's/heads\///') -else - COMMIT=unknown -fi +if [ ! -f configure -o configure.ac -nt configure -o \ + ! -f Makefile.in -o Makefile.am -nt Makefile.in ] +then + if [ -d .git ]; then + # Make sure that all of the dependencies are available + git submodule init + git submodule update + + COMMIT=$(git describe --all --long | sed 's/heads\///') + else + COMMIT=unknown + fi + echo "m4_define([VERSION_NUMBER], [$COMMIT])" > version.m4 -echo "m4_define([VERSION_NUMBER], [$COMMIT])" > version.m4 -sh tools/autogen.sh + sh tools/autogen.sh + # configure the template files + if [ ! -f po/Makevars ]; then + mv po/Makevars.template po/Makevars + fi + git ls-files '*.cc' '*.h' | egrep '^(src|python)/' > po/POTFILES.in -# configure the template files -if [ ! -f po/Makevars ]; then - mv po/Makevars.template po/Makevars + # regenerate aclocal.m4 + aclocal -I m4 fi -git ls-files '*.cc' '*.h' | egrep '^(src|python)/' > po/POTFILES.in - -# regenerate aclocal.m4 -aclocal -I m4 SWITCHES="--disable-shared --with-included-gettext" diff --git a/tools/build b/tools/build index 6a65ea0e..05c7d75a 100755 --- a/tools/build +++ b/tools/build @@ -9,11 +9,10 @@ if [ -d ~/Products/ledger ]; then fi if [ ! -f Makefile -o \ - $SRCDIR/Makefile.am -nt Makefile -o \ + $SRCDIR/Makefile.am -nt Makefile -o \ $SRCDIR/configure.ac -nt Makefile -o \ - $SRCDIR/acprep -nt Makefile -o \ - $SRCDIR/acprep -nt Makefile -o \ - $SRCDIR/tools/myacprep -nt Makefile ]; then + $SRCDIR/acprep -nt Makefile -o \ + $SRCDIR/myacprep -nt Makefile ]; then (cd $SRCDIR && tools/myacprep) fi |