kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=9c524862bf6bc337dce614bd104dea9ca10f2d8e
commit 9c524862bf6bc337dce614bd104dea9ca10f2d8e Author: Kim Woelders <[email protected]> Date: Sun Aug 12 06:46:51 2018 +0200 Simplify autogen.sh --- .gitignore | 2 +- Makefile.am | 1 + autogen.sh | 41 ++++------------------------------------- 3 files changed, 6 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 5ba43b57..d93a2e19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.svn Makefile Makefile.in @@ -10,6 +9,7 @@ Makefile.in *.gmo *~ +/ABOUT-NLS /aclocal.m4 /autom4te.cache /compile diff --git a/Makefile.am b/Makefile.am index fe972653..69cc4d69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = aclocal.m4 config.* compile configure depcomp \ install-sh ltmain.sh missing mkinstalldirs \ Makefile.in */Makefile.in */*/Makefile.in \ + ABOUT-NLS \ po/Makefile.in.in po/Makevars.template po/Rules-quot \ po/*.header po/*.sed po/*.sin po/e16.pot \ *~ */*~ diff --git a/autogen.sh b/autogen.sh index 9303080d..0d433612 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,43 +1,10 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -srcdir=`dirname $0` +rm -rf autom4te.cache aclocal.m4 -(test -d src && test -d dox) || { - echo "You must run this script in the top-level directory" - exit 1 -} +autoreconf -vif -echo "Generating configuration files, please wait...." - -rm -rf autom4te.cache -rm -f aclocal.m4 - -echo "Running autopoint -f" -autopoint -f || gautopoint -f || exit 1 -rm -f ABOUT-NLS -echo "Running aclocal -I m4 $ACLOCAL_FLAGS" -aclocal -I m4 $ACLOCAL_FLAGS || exit 1 -echo "Running autoconf" -autoconf || exit 1 -echo "Running autoheader" -autoheader || exit 1 -echo "Running libtoolize" -libtoolize --copy --automake || glibtoolize --automake || exit 1 -echo "Running automake --add-missing" -automake --copy --add-missing || exit 1 - -if test x$NOCONFIGURE != x; then - echo "Skipping configure process." - exit +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" fi - -#conf_flags="--enable-maintainer-mode --enable-compile-warnings" - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -echo "Running $srcdir/configure $conf_flags $@ ..." -$srcdir/configure $conf_flags "$@" --
