build: non-recursive Automake in a less hacky way
* bootstrap.conf (gnulib_modules): Remove non-recursive-gnulib-prefix-hack. (gnulib_tool_option_extras): Add --automake-subdir. (bootstrap_post_import_hook): No need to massage lib/gnulib.mk. * configure.ac [AM_INIT_AUTOMAKE]: Move subdir-objects onto the same line as the function name, so gnulib-tool sees it.
This commit is contained in:
1 parent
e84505f123
commit
a465ca5f22
2 files changed
+2
-7
No files matched your search
+1
-5
@@ -45,7 +45,6 @@ mbsinit
|
||||
memchr
|
||||
memrchr
|
||||
mkostemp
|
||||
non-recursive-gnulib-prefix-hack
|
||||
obstack
|
||||
perl
|
||||
progname
|
||||
@@ -84,7 +83,7 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
|
||||
'
|
||||
|
||||
gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\
|
||||
--makefile-name=gnulib.mk
|
||||
--makefile-name=gnulib.mk --automake-subdir
|
||||
$avoided_gnulib_modules
|
||||
"
|
||||
|
||||
@@ -106,9 +105,6 @@ bootstrap_post_import_hook ()
|
||||
{
|
||||
# Automake requires that ChangeLog exist.
|
||||
touch ChangeLog || return 1
|
||||
|
||||
# Massage lib/gnulib.mk before using it later in the bootstrapping process.
|
||||
build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
|
||||
}
|
||||
|
||||
bootstrap_epilogue()
|
||||
|
||||
+1
-2
@@ -21,8 +21,7 @@ AC_CONFIG_AUX_DIR(build-aux)
|
||||
AC_CONFIG_SRCDIR([sed/sed.c])
|
||||
AC_CONFIG_HEADERS([config.h:config_h.in])
|
||||
AC_PREREQ([2.64])
|
||||
AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests
|
||||
subdir-objects])
|
||||
AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests subdir-objects])
|
||||
AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
|
||||
Reference in new issue
Block a user