[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH 37/46] Use Paths.mk for docs, stubdom and tools build



Paths.mk contains just directories set by configure.
Source this file first when building docs,stubdom or tools.
Remove unused path variables from Paths.mk

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 config/Docs.mk.in    | 7 -------
 config/Paths.mk.in   | 2 ++
 config/Stubdom.mk.in | 8 --------
 config/Tools.mk.in   | 7 -------
 docs/Makefile        | 1 +
 stubdom/Makefile     | 1 +
 tools/Rules.mk       | 2 +-
 7 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/config/Docs.mk.in b/config/Docs.mk.in
index 497650f..22537d7 100644
--- a/config/Docs.mk.in
+++ b/config/Docs.mk.in
@@ -1,10 +1,3 @@
-# Prefix and install folder
-prefix              := @prefix@
-PREFIX              := $(prefix)
-exec_prefix         := @exec_prefix@
-libdir              := @libdir@
-LIBDIR              := $(libdir)
-
 # Tools
 FIG2DEV             := @FIG2DEV@
 POD2MAN             := @POD2MAN@
diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 518cf1d..0d5972d 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -12,6 +12,8 @@
 #
 # 
http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration
 
+PREFIX                   := @prefix@
+
 SBINDIR                  := @SBINDIR@
 BINDIR                   := @BINDIR@
 LIBEXEC                  := @LIBEXEC@
diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in
index c1c83bc..1b830eb 100644
--- a/config/Stubdom.mk.in
+++ b/config/Stubdom.mk.in
@@ -1,11 +1,3 @@
-# Prefix and install folder
--include $(XEN_ROOT)/config/Paths.mk
-prefix              := @prefix@
-PREFIX              := $(prefix)
-exec_prefix         := @exec_prefix@
-libdir              := @libdir@
-LIBDIR              := $(libdir)
-
 # Path Programs
 CMAKE               := @CMAKE@
 FETCHER             := @FETCHER@
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 23ae8b1..e90578b 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -3,13 +3,6 @@ ifeq ($(CONFIG_RUMP),y)
 XEN_OS              := NetBSDRump
 endif
 
-# Prefix and install folder
-prefix              := @prefix@
-PREFIX              := $(prefix)
-exec_prefix         := @exec_prefix@
-libdir              := @libdir@
-LIBDIR              := $(libdir)
-
 # A debug build of tools?
 debug               := @debug@
 
diff --git a/docs/Makefile b/docs/Makefile
index 2c0903b..2518b5f 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT=$(CURDIR)/..
+-include $(XEN_ROOT)/config/Paths.mk
 include $(XEN_ROOT)/Config.mk
 -include $(XEN_ROOT)/config/Docs.mk
 
diff --git a/stubdom/Makefile b/stubdom/Makefile
index c072709..4236574 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -5,6 +5,7 @@ export XEN_OS=MiniOS
 
 export stubdom=y
 export debug=y
+-include $(XEN_ROOT)/config/Paths.mk
 include $(XEN_ROOT)/Config.mk
 -include $(XEN_ROOT)/config/Stubdom.mk
 
diff --git a/tools/Rules.mk b/tools/Rules.mk
index fa59365..167cc83 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -3,9 +3,9 @@
 # `all' is the default target
 all:
 
+-include $(XEN_ROOT)/config/Paths.mk
 -include $(XEN_ROOT)/config/Tools.mk
 include $(XEN_ROOT)/Config.mk
--include $(XEN_ROOT)/config/Paths.mk
 
 export _INSTALL := $(INSTALL)
 INSTALL = $(XEN_ROOT)/tools/cross-install

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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.