From: Timothy Day Date: Fri, 31 Jan 2025 05:09:34 +0000 (-0500) Subject: LU-18687 build: consolidate autoconf files X-Git-Tag: 2.16.53~121 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2cfdf23a2974c80eac81d6cc7d81d631e8348f93;p=fs%2Flustre-release.git LU-18687 build: consolidate autoconf files Maintain all of the autoconf files in the same top-level directory. This mirrors the practices of other projects (like ZFS) and makes it easier to find these files. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I6bfdef9032bf768a63292999a6e9369a85240a2b Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57933 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Arshad Hussain Reviewed-by: Max Wang Reviewed-by: Oleg Drokin --- diff --git a/autogen.sh b/autogen.sh index d77efa4..b96b99d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,9 +12,6 @@ set -e pw="$PWD" -for dir in libcfs lnet lustre ; do - ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $pw/$dir/autoconf" -done # avoid the "modules.order: No such file or directory" failure touch modules.order diff --git a/config/Makefile.am b/config/Makefile.am index 7bb4a62..7f5e9a3 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -3,11 +3,12 @@ # # This file is part of Lustre, http://www.lustre.org/ # -# config/Makefile.am -# # Template to generate Makefile # EXTRA_DIST = lustre-build.m4 lustre-build-linux.m4 EXTRA_DIST += lustre-build-ldiskfs.m4 lustre-build-zfs.m4 EXTRA_DIST += lustre-toolchain.m4 lustre-compiler-plugins.m4 +EXTRA_DIST += lustre-core.m4 kerberos5.m4 ac_pkg_swig.m4 +EXTRA_DIST += ac_python_devel.m4 lustre-lnet.m4 +EXTRA_DIST += lustre-libcfs.m4 diff --git a/lustre/autoconf/ac_pkg_swig.m4 b/config/ac_pkg_swig.m4 similarity index 100% rename from lustre/autoconf/ac_pkg_swig.m4 rename to config/ac_pkg_swig.m4 diff --git a/lustre/autoconf/ac_python_devel.m4 b/config/ac_python_devel.m4 similarity index 100% rename from lustre/autoconf/ac_python_devel.m4 rename to config/ac_python_devel.m4 diff --git a/lustre/autoconf/kerberos5.m4 b/config/kerberos5.m4 similarity index 100% rename from lustre/autoconf/kerberos5.m4 rename to config/kerberos5.m4 diff --git a/lustre/autoconf/lustre-core.m4 b/config/lustre-core.m4 similarity index 99% rename from lustre/autoconf/lustre-core.m4 rename to config/lustre-core.m4 index f09b100..13c887d 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/config/lustre-core.m4 @@ -5773,7 +5773,6 @@ AC_DEFUN([LC_CONFIG_FILES], [AC_CONFIG_FILES([ lustre/Makefile lustre/autoMakefile -lustre/autoconf/Makefile lustre/conf/Makefile lustre/conf/resource/Makefile lustre/doc/Makefile diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/config/lustre-libcfs.m4 similarity index 99% rename from libcfs/autoconf/lustre-libcfs.m4 rename to config/lustre-libcfs.m4 index 8e40111..0306a2e 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/config/lustre-libcfs.m4 @@ -2951,7 +2951,6 @@ AC_DEFUN([LIBCFS_CONFIG_FILES], [ AC_CONFIG_FILES([ libcfs/Makefile libcfs/autoMakefile -libcfs/autoconf/Makefile libcfs/include/Makefile libcfs/include/libcfs/Makefile libcfs/include/uapi/Makefile diff --git a/lnet/autoconf/lustre-lnet.m4 b/config/lustre-lnet.m4 similarity index 99% rename from lnet/autoconf/lustre-lnet.m4 rename to config/lustre-lnet.m4 index 4c46f9c..9722556 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/config/lustre-lnet.m4 @@ -1466,7 +1466,6 @@ AC_DEFUN([LN_CONFIG_FILES], [ AC_CONFIG_FILES([ lnet/Makefile lnet/autoMakefile -lnet/autoconf/Makefile lnet/doc/Makefile lnet/include/Makefile lnet/include/lnet/Makefile diff --git a/libcfs/autoMakefile.am b/libcfs/autoMakefile.am index f36c10a..aac0b9a 100644 --- a/libcfs/autoMakefile.am +++ b/libcfs/autoMakefile.am @@ -9,4 +9,4 @@ # This file is part of Lustre, http://www.lustre.org/ # -SUBDIRS = libcfs include autoconf +SUBDIRS = libcfs include diff --git a/libcfs/autoconf/.gitignore b/libcfs/autoconf/.gitignore deleted file mode 100644 index 10a7e8d..0000000 --- a/libcfs/autoconf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile.in diff --git a/libcfs/autoconf/Makefile.am b/libcfs/autoconf/Makefile.am deleted file mode 100644 index 62648e2..0000000 --- a/libcfs/autoconf/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -# -# This file is part of Lustre, http://www.lustre.org/ -# - -EXTRA_DIST = lustre-libcfs.m4 diff --git a/lnet/autoMakefile.am b/lnet/autoMakefile.am index 3e87f21..5626a6c 100644 --- a/lnet/autoMakefile.am +++ b/lnet/autoMakefile.am @@ -11,8 +11,6 @@ # This file is part of Lustre, http://www.lustre.org/ # -SUBDIRS = lnet klnds selftest doc utils include \ - autoconf +SUBDIRS = lnet klnds selftest doc utils include -DIST_SUBDIRS = lnet klnds selftest doc utils include \ - autoconf +DIST_SUBDIRS = lnet klnds selftest doc utils include diff --git a/lnet/autoconf/.gitignore b/lnet/autoconf/.gitignore deleted file mode 100644 index 10a7e8d..0000000 --- a/lnet/autoconf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile.in diff --git a/lnet/autoconf/Makefile.am b/lnet/autoconf/Makefile.am deleted file mode 100644 index cfcffbc..0000000 --- a/lnet/autoconf/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -# -# This file is part of Lustre, http://www.lustre.org/ -# - -EXTRA_DIST = lustre-lnet.m4 diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am index 0cdfd67..ad2390b 100644 --- a/lustre/autoMakefile.am +++ b/lustre/autoMakefile.am @@ -35,7 +35,7 @@ AUTOMAKE_OPTIONS = foreign # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho ec \ - mgc fid fld doc utils tests scripts autoconf conf + mgc fid fld doc utils tests scripts conf SERVER_SUBDIRS = mgs mdt mdd ofd osd-zfs osd-ldiskfs \ quota osp lod target lfsck diff --git a/lustre/autoconf/.gitignore b/lustre/autoconf/.gitignore deleted file mode 100644 index 10a7e8d..0000000 --- a/lustre/autoconf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile.in diff --git a/lustre/autoconf/Makefile.am b/lustre/autoconf/Makefile.am deleted file mode 100644 index 7a71dc4..0000000 --- a/lustre/autoconf/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = lustre-core.m4 kerberos5.m4 ac_pkg_swig.m4 ac_python_devel.m4