diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | config/Tools.mk.in | 4 | ||||
| -rw-r--r-- | config/Xen.mk.in | 19 | ||||
| -rw-r--r-- | tools/configure.ac | 1 | ||||
| -rw-r--r-- | xen/Rules.mk | 1 |
6 files changed, 23 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 8810b35b54..865505fb1e 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ tools/config.log tools/config.status tools/config.cache config/Tools.mk +config/Xen.mk tools/blktap2/daemon/blktapctrl tools/blktap2/drivers/img2qcow tools/blktap2/drivers/lock-util @@ -309,6 +309,7 @@ ^tools/config\.status$ ^tools/config\.cache$ ^config/Tools\.mk$ +^config/Xen\.mk$ ^xen/\.banner.*$ ^xen/BLOG$ ^xen/System.map$ diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 06d5e8974b..315ced4945 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -24,10 +24,6 @@ PREPEND_LIB := @PREPEND_LIB@ APPEND_INCLUDES := @APPEND_INCLUDES@ APPEND_LIB := @APPEND_LIB@ -# Enable XSM security module (by default, Flask). -XSM_ENABLE := @xsm@ -FLASK_ENABLE := @xsm@ - # Download GIT repositories via HTTP or GIT's own protocol? # GIT's protocol is faster and more robust, when it works at all (firewalls # may block it). We make it the default, but if your GIT repository downloads diff --git a/config/Xen.mk.in b/config/Xen.mk.in new file mode 100644 index 0000000000..e152f398aa --- /dev/null +++ b/config/Xen.mk.in @@ -0,0 +1,19 @@ +# Prefix and install folder +PREFIX := @prefix@ +LIBLEAFDIR_x86_64 := @LIB_PATH@ + +# A debug build of xen? +debug := @debug@ + +# Tools path +PYTHON := @PYTHON@ + +# Extra folder for libs/includes +PREPEND_INCLUDES := @PREPEND_INCLUDES@ +PREPEND_LIB := @PREPEND_LIB@ +APPEND_INCLUDES := @APPEND_INCLUDES@ +APPEND_LIB := @APPEND_LIB@ + +# Enable XSM security module (by default, Flask). +XSM_ENABLE := @xsm@ +FLASK_ENABLE := @xsm@ diff --git a/tools/configure.ac b/tools/configure.ac index c5dec9c59f..5b2815d16c 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -6,6 +6,7 @@ AC_INIT([Xen Hypervisor], m4_esyscmd([../version.sh ../xen/Makefile]), [xen-devel@lists.xensource.com]) AC_CONFIG_SRCDIR([libxl/libxl.c]) AC_CONFIG_FILES([../config/Tools.mk]) +AC_CONFIG_FILES([../config/Xen.mk]) AC_CONFIG_HEADERS([config.h]) AC_PREFIX_DEFAULT([/usr]) AC_CONFIG_AUX_DIR([.]) diff --git a/xen/Rules.mk b/xen/Rules.mk index 6123835ec1..6c17a3fad4 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -12,6 +12,7 @@ frame_pointer ?= n lto ?= n include $(XEN_ROOT)/Config.mk +include $(XEN_ROOT)/config/Xen.mk # Hardcoded configuration implications and dependencies. # Do this is a neater way if it becomes unwieldy. |