mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
synced 2024-11-23 04:04:33 +08:00
btrfs-progs: build: reuse config/ directory for m4 macros
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:
parent
3c1b96bff7
commit
e1eddbeb4c
1
.gitignore
vendored
1
.gitignore
vendored
@ -54,7 +54,6 @@
|
||||
/aclocal.m4
|
||||
/autom4te.cache
|
||||
/config.cache
|
||||
/config/*
|
||||
/include/config.h
|
||||
/include/config.h.in
|
||||
/include/config.h.in~
|
||||
|
2
Makefile
2
Makefile
@ -865,7 +865,7 @@ clean-gen:
|
||||
Documentation/Makefile tags TAGS \
|
||||
cscope.files cscope.out cscope.in.out cscope.po.out \
|
||||
config.log include/config.h include/config.h.in~ aclocal.m4 \
|
||||
configure autom4te.cache/ config/
|
||||
configure autom4te.cache/
|
||||
|
||||
clean-dep:
|
||||
@echo "Cleaning dependency files"
|
||||
|
@ -63,9 +63,9 @@ echo " automake: $(automake --version | head -1)"
|
||||
|
||||
rm -rf autom4te.cache
|
||||
|
||||
aclocal -I m4 $AL_OPTS &&
|
||||
autoconf -I m4 $AC_OPTS &&
|
||||
autoheader -I m4 $AH_OPTS ||
|
||||
aclocal -I config $AL_OPTS &&
|
||||
autoconf -I config $AC_OPTS &&
|
||||
autoheader -I config $AH_OPTS ||
|
||||
exit 1
|
||||
|
||||
# it's better to use helper files from automake installation than
|
||||
@ -87,7 +87,6 @@ find_autofile() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
mkdir -p config/
|
||||
find_autofile config.guess
|
||||
find_autofile config.sub
|
||||
find_autofile install-sh
|
||||
|
@ -30,7 +30,7 @@ AC_SUBST([CFLAGS])
|
||||
AC_PREREQ([2.60])
|
||||
|
||||
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 the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors.
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
Loading…
Reference in New Issue
Block a user