Re: [Xen-devel] [PATCH] config: generate Paths-$SUBSYSTEM.mk

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Thu, 2015-04-23 at 10:10 +0100, Wei Liu wrote:
> ... so that we can run ./configure in each subsystem.
> 
> Make inclusion of Paths-*.mk mandatory.

Having done that does the Makefile machinery which prints the "You need
to run configure message" still work? (That's the main reason some
includes are optional AFAIR)

Ian.


>  Skip generating a global
> Paths.mk since it's of no use anymore.
> 
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> ---
> Please rerun autogen.sh
> ---
>  config/Docs.mk.in    | 2 +-
>  config/Stubdom.mk.in | 2 +-
>  config/Tools.mk.in   | 2 +-
>  configure            | 3 +--
>  configure.ac         | 5 +----
>  docs/configure       | 3 ++-
>  docs/configure.ac    | 5 ++++-
>  stubdom/configure    | 3 ++-
>  stubdom/configure.ac | 5 ++++-
>  tools/configure      | 3 ++-
>  tools/configure.ac   | 1 +
>  11 files changed, 20 insertions(+), 14 deletions(-)
> 
> diff --git a/config/Docs.mk.in b/config/Docs.mk.in
> index 33bd529..df86d93 100644
> --- a/config/Docs.mk.in
> +++ b/config/Docs.mk.in
> @@ -1,4 +1,4 @@
> --include $(XEN_ROOT)/config/Paths.mk
> +include $(XEN_ROOT)/config/Paths-docs.mk
>  
>  # Tools
>  FIG2DEV             := @FIG2DEV@
> diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in
> index 5990fc4..ea8700c 100644
> --- a/config/Stubdom.mk.in
> +++ b/config/Stubdom.mk.in
> @@ -1,4 +1,4 @@
> --include $(XEN_ROOT)/config/Paths.mk
> +include $(XEN_ROOT)/config/Paths-stubdom.mk
>  
>  # Path Programs
>  CMAKE               := @CMAKE@
> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index e7da99d..bf6c4bc 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -1,4 +1,4 @@
> --include $(XEN_ROOT)/config/Paths.mk
> +include $(XEN_ROOT)/config/Paths-tools.mk
>  
>  CONFIG_RUMP         := @CONFIG_RUMP@
>  ifeq ($(CONFIG_RUMP),y)
> diff --git a/configure b/configure
> index 8a084c8..13e7e8f 100755
> --- a/configure
> +++ b/configure
> @@ -1728,7 +1728,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
> 
> 
> -ac_config_files="$ac_config_files config/Toplevel.mk config/Paths.mk"
> +ac_config_files="$ac_config_files config/Toplevel.mk"
>  
> 
>  ac_aux_dir=
> @@ -2896,7 +2896,6 @@ for ac_config_target in $ac_config_targets
>  do
>    case $ac_config_target in
>      "config/Toplevel.mk") CONFIG_FILES="$CONFIG_FILES config/Toplevel.mk" ;;
> -    "config/Paths.mk") CONFIG_FILES="$CONFIG_FILES config/Paths.mk" ;;
>  
>    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
>    esac
> diff --git a/configure.ac b/configure.ac
> index 1843b52..fd5ebfd 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -5,10 +5,7 @@ AC_PREREQ([2.67])
>  AC_INIT([Xen Hypervisor], m4_esyscmd([./version.sh ./xen/Makefile]),
>      [xen-devel@xxxxxxxxxxxxx], [xen], [http://www.xen.org/])
>  AC_CONFIG_SRCDIR([./xen/common/kernel.c])
> -AC_CONFIG_FILES([
> -     config/Toplevel.mk
> -     config/Paths.mk
> -])
> +AC_CONFIG_FILES([config/Toplevel.mk])
>  
>  AC_CANONICAL_HOST
>  
> diff --git a/docs/configure b/docs/configure
> index fb1d96c..7bf71c5 100755
> --- a/docs/configure
> +++ b/docs/configure
> @@ -1693,7 +1693,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
> 
> 
> -ac_config_files="$ac_config_files ../config/Docs.mk"
> +ac_config_files="$ac_config_files ../config/Docs.mk 
> ../config/Paths-docs.mk:../config/Paths.mk.in"
>  
>  ac_aux_dir=
>  for ac_dir in ../ "$srcdir"/../; do
> @@ -2793,6 +2793,7 @@ for ac_config_target in $ac_config_targets
>  do
>    case $ac_config_target in
>      "../config/Docs.mk") CONFIG_FILES="$CONFIG_FILES ../config/Docs.mk" ;;
> +    "../config/Paths-docs.mk") CONFIG_FILES="$CONFIG_FILES 
> ../config/Paths-docs.mk:../config/Paths.mk.in" ;;
>  
>    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
>    esac
> diff --git a/docs/configure.ac b/docs/configure.ac
> index bc77f49..24138b5 100644
> --- a/docs/configure.ac
> +++ b/docs/configure.ac
> @@ -5,7 +5,10 @@ AC_PREREQ([2.67])
>  AC_INIT([Xen Hypervisor Documentation], m4_esyscmd([../version.sh 
> ../xen/Makefile]),
>      [xen-devel@xxxxxxxxxxxxx], [xen], [http://www.xen.org/])
>  AC_CONFIG_SRCDIR([misc/xen-command-line.markdown])
> -AC_CONFIG_FILES([../config/Docs.mk])
> +AC_CONFIG_FILES([
> +../config/Docs.mk
> +../config/Paths-docs.mk:../config/Paths.mk.in
> +])
>  AC_CONFIG_AUX_DIR([../])
>  
>  # M4 Macro includes
> diff --git a/stubdom/configure b/stubdom/configure
> index f4b1cd3..21e382c 100755
> --- a/stubdom/configure
> +++ b/stubdom/configure
> @@ -1829,7 +1829,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
> 
> 
> -ac_config_files="$ac_config_files ../config/Stubdom.mk"
> +ac_config_files="$ac_config_files ../config/Stubdom.mk 
> ../config/Paths-stubdom.mk:../config/Paths.mk.in"
>  
>  ac_aux_dir=
>  for ac_dir in ../ "$srcdir"/../; do
> @@ -4344,6 +4344,7 @@ for ac_config_target in $ac_config_targets
>  do
>    case $ac_config_target in
>      "../config/Stubdom.mk") CONFIG_FILES="$CONFIG_FILES 
> ../config/Stubdom.mk" ;;
> +    "../config/Paths-stubdom.mk") CONFIG_FILES="$CONFIG_FILES 
> ../config/Paths-stubdom.mk:../config/Paths.mk.in" ;;
>  
>    *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
>    esac
> diff --git a/stubdom/configure.ac b/stubdom/configure.ac
> index 9fec853..31c3356 100644
> --- a/stubdom/configure.ac
> +++ b/stubdom/configure.ac
> @@ -5,7 +5,10 @@ AC_PREREQ([2.67])
>  AC_INIT([Xen Hypervisor Stub Domains], m4_esyscmd([../version.sh 
> ../xen/Makefile]),
>      [xen-devel@xxxxxxxxxxxxx], [xen], [http://www.xen.org/])
>  AC_CONFIG_SRCDIR([xenstore-minios.cfg])
> -AC_CONFIG_FILES([../config/Stubdom.mk])
> +AC_CONFIG_FILES([
> +../config/Stubdom.mk
> +../config/Paths-stubdom.mk:../config/Paths.mk.in
> +])
>  AC_CONFIG_AUX_DIR([../])
>  
>  AC_CANONICAL_HOST
> diff --git a/tools/configure b/tools/configure
> index a752acd..a596584 100755
> --- a/tools/configure
> +++ b/tools/configure
> @@ -2282,7 +2282,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
> 
> 
> -ac_config_files="$ac_config_files ../config/Tools.mk 
> hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons 
> hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons 
> hotplug/Linux/init.d/xendomains hotplug/Linux/vif-setup 
> hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh 
> hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons libxl/xenlight.pc.in 
> libxl/xlutil.pc.in"
> +ac_config_files="$ac_config_files ../config/Tools.mk 
> ../config/Paths-tools.mk:../config/Paths.mk.in 
> hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons 
> hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons 
> hotplug/Linux/init.d/xendomains hotplug/Linux/vif-setup 
> hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh 
> hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons libxl/xenlight.pc.in 
> libxl/xlutil.pc.in"
>  
>  ac_config_headers="$ac_config_headers config.h"
>  
> @@ -9693,6 +9693,7 @@ for ac_config_target in $ac_config_targets
>  do
>    case $ac_config_target in
>      "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;;
> +    "../config/Paths-tools.mk") CONFIG_FILES="$CONFIG_FILES 
> ../config/Paths-tools.mk:../config/Paths.mk.in" ;;
>      "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES 
> hotplug/FreeBSD/rc.d/xencommons" ;;
>      "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES 
> hotplug/Linux/init.d/sysconfig.xencommons" ;;
>      "hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES="$CONFIG_FILES 
> hotplug/Linux/init.d/xen-watchdog" ;;
> diff --git a/tools/configure.ac b/tools/configure.ac
> index d31c2f3..aec2a31 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -7,6 +7,7 @@ AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh 
> ../xen/Makefile]),
>  AC_CONFIG_SRCDIR([libxl/libxl.c])
>  AC_CONFIG_FILES([
>  ../config/Tools.mk
> +../config/Paths-tools.mk:../config/Paths.mk.in
>  hotplug/FreeBSD/rc.d/xencommons
>  hotplug/Linux/init.d/sysconfig.xencommons
>  hotplug/Linux/init.d/xen-watchdog



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel