[PATCH v2] config: generate Paths-$SUBSYSTEM.mk

* [PATCH v2] config: generate Paths-$SUBSYSTEM.mk
@ 2015-05-06  5:02 Wei Liu
  2015-05-08 14:43 ` Ian Campbell
  0 siblings, 1 reply; 3+ messages in thread
From: Wei Liu @ 2015-05-06  5:02 UTC (permalink / raw)
  To: xen-devel; +Cc: Ian Jackson, Wei Liu, Ian Campbell

... so that we can run ./configure in each subsystem.

Make inclusion of Paths-*.mk mandatory. Skip generating a global
Paths.mk since it's of no use anymore.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: update .gitignore, delete Paths-*.mk in distclean

Please rerun autogen.sh when applying this patch.
---
 .gitignore           | 2 +-
 config/Docs.mk.in    | 2 +-
 config/Stubdom.mk.in | 2 +-
 config/Tools.mk.in   | 2 +-
 configure.ac         | 5 +----
 docs/Makefile        | 3 ++-
 docs/configure.ac    | 5 ++++-
 stubdom/Makefile     | 3 ++-
 stubdom/configure.ac | 5 ++++-
 tools/Makefile       | 3 ++-
 tools/configure.ac   | 1 +
 11 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6185a0..8381422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ config.log
 config.status
 config.cache
 config/Toplevel.mk
-config/Paths.mk
+config/Paths*.mk
 
 build-*
 dist/*
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.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@lists.xen.org], [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/Makefile b/docs/Makefile
index 854fb50..fc26158 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -92,7 +92,8 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(XEN_ROOT)/config/Docs.mk config.log config.status config.cache \
+	rm -rf $(XEN_ROOT)/config/Docs.mk $(XEN_ROOT)/config/Paths-docs.mk \
+		config.log config.status config.cache \
 		autom4te.cache
 
 .PHONY: install-man-pages
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@lists.xen.org], [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/Makefile b/stubdom/Makefile
index d9e7e40..5172464 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -564,7 +564,8 @@ downloadclean: patchclean
 
 .PHONY: distclean
 distclean: downloadclean
-	rm -rf config.log config.status config.cache autom4te.cache ../config/Stubdom.mk
+	rm -rf config.log config.status config.cache autom4te.cache \
+		../config/Stubdom.mk ../config/Paths-stubdom.mk
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Stubdom.mk:
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@lists.xen.org], [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/Makefile b/tools/Makefile
index 966354a..e8c41b2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -108,7 +108,8 @@ clean: subdirs-clean
 distclean: subdirs-distclean
 	rm -rf qemu-xen-traditional-dir qemu-xen-traditional-dir-remote
 	rm -rf qemu-xen-dir qemu-xen-dir-remote
-	rm -rf ../config/Tools.mk config.h config.log config.status \
+	rm -rf ../config/Tools.mk ../config/Paths-tools.mk \
+		config.h config.log config.status \
 		config.cache autom4te.cache
 
 ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
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
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread