c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: build: reuse config/ directory for m4 macros

Browse source 
Move files from m4/ to config that is also used for build and we can
reduce the number of toplevel directories.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-05-26 21:03:19 +02:00
parent 3c1b96bff7
commit e1eddbeb4c
7 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -54,7 +54,6 @@
/aclocal.m4 /aclocal.m4
/autom4te.cache /autom4te.cache
/config.cache /config.cache
/config/*
/include/config.h /include/config.h
/include/config.h.in /include/config.h.in
/include/config.h.in~ /include/config.h.in~

2
Makefile
View file

@ -865,7 +865,7 @@ clean-gen:
Documentation/Makefile tags TAGS \ Documentation/Makefile tags TAGS \
cscope.files cscope.out cscope.in.out cscope.po.out \ cscope.files cscope.out cscope.in.out cscope.po.out \
config.log include/config.h include/config.h.in~ aclocal.m4 \ config.log include/config.h include/config.h.in~ aclocal.m4 \
configure autom4te.cache/ config/ configure autom4te.cache/
clean-dep: clean-dep:
@echo "Cleaning dependency files" @echo "Cleaning dependency files"

7
autogen.sh
View file

@ -63,9 +63,9 @@ echo " automake: $(automake --version | head -1)"
rm -rf autom4te.cache rm -rf autom4te.cache
aclocal -I m4 $AL_OPTS && aclocal -I config $AL_OPTS &&
autoconf -I m4 $AC_OPTS && autoconf -I config $AC_OPTS &&
autoheader -I m4 $AH_OPTS || autoheader -I config $AH_OPTS ||
exit 1 exit 1
# it's better to use helper files from automake installation than # it's better to use helper files from automake installation than
@ -87,7 +87,6 @@ find_autofile() {
exit 1 exit 1
} }
mkdir -p config/
find_autofile config.guess find_autofile config.guess
find_autofile config.sub find_autofile config.sub
find_autofile install-sh find_autofile install-sh

0
m4/ax_check_compile_flag.m4 → config/ax_check_compile_flag.m4
View file

0
m4/ax_check_define.m4 → config/ax_check_define.m4
View file

0
m4/ax_gcc_builtin.m4 → config/ax_gcc_builtin.m4
View file

2
configure.ac
View file

@ -30,7 +30,7 @@ AC_SUBST([CFLAGS])
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR([config]) AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([config])
dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run
dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors. dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors.
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS