aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2005-01-25 16:41:47 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2005-01-25 16:41:47 +0000
commit3279b48916b664d78b652c8358ff0ec06e2cdaca (patch)
tree861477bf198464f4208bf060cfbdf4e189571501
parentd63e6e0318369f1d14ec09381f6c96deddcd0fce (diff)
downloadxen-3279b48916b664d78b652c8358ff0ec06e2cdaca.tar.gz
xen-3279b48916b664d78b652c8358ff0ec06e2cdaca.tar.bz2
xen-3279b48916b664d78b652c8358ff0ec06e2cdaca.zip
bitkeeper revision 1.1159.223.40 (41f676cbajLGqFeWFqajtJ3X4OkgoA)
Build system fixes. Signed-off-by: keir.fraser@cl.cam.ac.uk
-rw-r--r--Makefile49
-rw-r--r--docs/Makefile5
-rw-r--r--linux-2.4.29-xen-sparse/arch/xen/Makefile3
-rw-r--r--linux-2.6.10-xen-sparse/arch/xen/Makefile2
-rw-r--r--tools/Makefile8
-rw-r--r--tools/examples/Makefile4
-rw-r--r--tools/libxutil/Makefile6
-rw-r--r--tools/python/Makefile6
-rw-r--r--tools/vnet/Makefile3
-rw-r--r--tools/vnet/examples/Makefile4
-rw-r--r--tools/vnet/vnet-module/Makefile-2.44
-rw-r--r--tools/vnet/vnet-module/Makefile-2.64
-rw-r--r--tools/vnet/vnetd/Makefile4
-rw-r--r--tools/xfrd/Makefile4
-rw-r--r--xen/Makefile3
15 files changed, 31 insertions, 78 deletions
diff --git a/Makefile b/Makefile
index c7b4640ecc..0bd91f33ab 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,6 @@
# Grand Unified Makefile for Xen.
#
-DISTDIR ?= $(CURDIR)/dist
-DESTDIR ?= $(DISTDIR)/install
-
INSTALL := install
INSTALL_DIR := $(INSTALL) -d -m0755
INSTALL_DATA := $(INSTALL) -m0644
@@ -18,7 +15,6 @@ ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
-
export DESTDIR
include buildconfigs/Rules.mk
@@ -31,26 +27,16 @@ all: dist
# install everything into the standard system directories
# NB: install explicitly does not check that everything is up to date!
-install: install-tools install-xen install-kernels install-docs
+install: xen checked-tools kernels docs
-install-xen:
- $(MAKE) -C xen install
-
-install-tools:
+# Only check for install req'mts on 'make install', not on 'make dist'.
+checked-tools:
+ $(MAKE) -C tools/check install
$(MAKE) -C tools install
-install-kernels:
- cp -a $(DESTDIR)/boot/* /boot/
- cp -a $(DESTDIR)/lib/modules/* /lib/modules/
- cp -dR $(DESTDIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
- cp -dR $(DESTDIR)/lib/modules/* $(prefix)/lib/modules/
-
-install-docs:
- sh ./docs/check_pkgs && $(MAKE) -C docs install || true
- sh ./docs/check_pkgs
- -$(MAKE) -C docs install
-
# build and install everything into local dist directory
+dist: DISTDIR=$(CURDIR)/dist
+dist: DESTDIR=$(DISTDIR)/install
dist: xen tools kernels docs
$(INSTALL_DIR) $(DISTDIR)/check
$(INSTALL_DATA) ./COPYING $(DISTDIR)
@@ -59,17 +45,16 @@ dist: xen tools kernels docs
$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check
xen:
- $(MAKE) dist=yes -C xen install
+ $(MAKE) -C xen install
tools:
- $(MAKE) dist=yes -C tools install
+ $(MAKE) -C tools install
kernels:
for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
docs:
- sh ./docs/check_pkgs
- -$(MAKE) dist=yes -C docs install
+ sh ./docs/check_pkgs && $(MAKE) -C docs install || true
# Build all the various kernels and modules
kbuild: kernels
@@ -126,21 +111,17 @@ install-iptables:
help:
@echo 'Installation targets:'
- @echo ' install - install everything'
- @echo ' install-xen - install the Xen hypervisor'
- @echo ' install-tools - install the control tools'
- @echo ' install-kernels - install guest kernels'
- @echo ' install-docs - install documentation'
+ @echo ' install - build and install everything'
@echo ''
@echo 'Building targets:'
- @echo ' dist - build everything and place in dist/'
+ @echo ' dist - build and install everything into local dist directory'
@echo ' world - clean everything, delete guest kernel build'
@echo ' trees then make dist'
- @echo ' xen - build Xen hypervisor and place in dist/'
- @echo ' tools - build tools and place in dist/'
- @echo ' kernels - build guest kernels and place in dist/'
+ @echo ' xen - build and install Xen hypervisor'
+ @echo ' tools - build and install tools'
+ @echo ' kernels - build and install guest kernels'
@echo ' kbuild - synonym for make kernels'
- @echo ' docs - build docs and place in dist/'
+ @echo ' docs - build and install docs'
@echo ''
@echo 'Cleaning targets:'
@echo ' clean - clean the Xen, tools and docs (but not'
diff --git a/docs/Makefile b/docs/Makefile
index 46c2d38c59..d9ae6715ac 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -10,10 +10,7 @@ FIG2DEV := fig2dev
TGIF := tgif
LATEX2HTML := latex2html
-package = xen
-prefix = /usr
-docdir = $(prefix)/share/doc
-pkgdocdir = $(docdir)/$(package)
+pkgdocdir := /usr/share/doc/xen
DOC_TEX := $(wildcard src/*.tex)
DOC_PS := $(patsubst src/%.tex,ps/%.ps,$(DOC_TEX))
diff --git a/linux-2.4.29-xen-sparse/arch/xen/Makefile b/linux-2.4.29-xen-sparse/arch/xen/Makefile
index df13c06a6e..0f1d0580da 100644
--- a/linux-2.4.29-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile
@@ -118,9 +118,6 @@ install: bzImage
install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
-dist:
- $(MAKE) INSTALL_PATH=../dist/install install
-
%_config: arch/xen/defconfig-%
rm -f .config arch/xen/defconfig
cp -f arch/xen/defconfig-$(@:_config=) arch/xen/defconfig
diff --git a/linux-2.6.10-xen-sparse/arch/xen/Makefile b/linux-2.6.10-xen-sparse/arch/xen/Makefile
index eeaea0c89e..86132ecf16 100644
--- a/linux-2.6.10-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.10-xen-sparse/arch/xen/Makefile
@@ -54,8 +54,6 @@ install: vmlinuz
install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
-dist:
- $(MAKE) INSTALL_PATH=../dist/install install
archclean:
@if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;
diff --git a/tools/Makefile b/tools/Makefile
index 722f9d9f7d..907260707b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,9 +10,7 @@ all:
$(MAKE) -C xfrd
install:
-ifneq ($(dist),yes)
- $(MAKE) -C check install
-endif
+ $(MAKE) -C check
$(MAKE) -C libxutil install
$(MAKE) -C libxc install
$(MAKE) -C misc install
@@ -22,10 +20,6 @@ endif
$(MAKE) -C xfrd install
$(MAKE) -C sv install
-dist: $(TARGET)
- $(MAKE) prefix=$(CURDIR)/../dist/install dist=yes install
-
-
clean:
$(MAKE) -C libxutil clean
$(MAKE) -C libxc clean
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 0fb4950476..cc9ebbc50e 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -33,14 +33,14 @@ install-configs:
$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto
for i in $(XEN_CONFIGS); \
- do [ -a $(DESTDIR)/$(XEN_CONFIG_DIR)/$$i ] || \
+ do [ -a $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
$(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
done
install-scripts:
$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
for i in $(XEN_SCRIPTS); \
- do [ -a $(DESTDIR)/$()/$$i ] || \
+ do [ -a $(DESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \
$(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
done
diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile
index d68699de28..bedbcc7c5c 100644
--- a/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@ -25,11 +25,7 @@ LIB_SRCS += util.c
LIB_OBJS := $(LIB_SRCS:.c=.o)
-CFLAGS += -Wall
-CFLAGS += -Werror
-CFLAGS += -g
-CFLAGS += -O3
-CFLAGS += -fno-strict-aliasing
+CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
diff --git a/tools/python/Makefile b/tools/python/Makefile
index 9d39bd85b4..18bfeb1f7d 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -3,11 +3,7 @@ all:
python setup.py build
install: all
- if [ "$(DESTDIR)" = "" ]; then \
- python setup.py install; \
- else \
- python setup.py install --root="$(DESTDIR)"; \
- fi
+ python setup.py install --home="$(DESTDIR)/usr"
clean:
rm -rf build *.pyc *.pyo *.o *.a *~
diff --git a/tools/vnet/Makefile b/tools/vnet/Makefile
index 1eddeb44cc..63939dff9d 100644
--- a/tools/vnet/Makefile
+++ b/tools/vnet/Makefile
@@ -44,9 +44,6 @@ install: compile
$(MAKE) -C vnet-module install
$(MAKE) -C examples install
-dist: $(TARGET)
- $(MAKE) install
-
clean:
-$(MAKE) -C vnetd clean
-$(MAKE) -C vnet-module clean
diff --git a/tools/vnet/examples/Makefile b/tools/vnet/examples/Makefile
index fe9d9f56ad..d0cc4a6e57 100644
--- a/tools/vnet/examples/Makefile
+++ b/tools/vnet/examples/Makefile
@@ -6,7 +6,7 @@ XEN_SCRIPT_DIR:=/etc/xen/scripts
all:
install:
- install -m 0755 -d $(prefix)$(XEN_SCRIPT_DIR)
- install -m 0554 network-vnet $(prefix)$(XEN_SCRIPT_DIR)
+ install -m 0755 -d $(DESTDIR)$(XEN_SCRIPT_DIR)
+ install -m 0554 network-vnet $(DESTDIR)$(XEN_SCRIPT_DIR)
clean: \ No newline at end of file
diff --git a/tools/vnet/vnet-module/Makefile-2.4 b/tools/vnet/vnet-module/Makefile-2.4
index 4a512aaa3b..68c34c2b29 100644
--- a/tools/vnet/vnet-module/Makefile-2.4
+++ b/tools/vnet/vnet-module/Makefile-2.4
@@ -83,8 +83,8 @@ $(KERNEL_MODULE): $(VNET_OBJ)
.PHONY: install install-module modules_install
install install-module modules_install: module
- install -m 0755 -d $(prefix)$(KERNEL_MODULE_DIR)
- install -m 0554 $(KERNEL_MODULE) $(prefix)$(KERNEL_MODULE_DIR)
+ install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)
+ install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)
TAGS:
etags *.c *.h
diff --git a/tools/vnet/vnet-module/Makefile-2.6 b/tools/vnet/vnet-module/Makefile-2.6
index 698644a1f4..64e57ea5ff 100644
--- a/tools/vnet/vnet-module/Makefile-2.6
+++ b/tools/vnet/vnet-module/Makefile-2.6
@@ -38,8 +38,8 @@ module modules:
.PHONY: install install-module modules_install
install install-module modules_install: module
- install -m 0755 -d $(prefix)$(KERNEL_MODULE_DIR)
- install -m 0554 $(KERNEL_MODULE) $(prefix)$(KERNEL_MODULE_DIR)
+ install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)
+ install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)
.PHONY: clean
clean:
diff --git a/tools/vnet/vnetd/Makefile b/tools/vnet/vnetd/Makefile
index 69d4c0269c..be13801a0c 100644
--- a/tools/vnet/vnetd/Makefile
+++ b/tools/vnet/vnetd/Makefile
@@ -92,8 +92,8 @@ vnetd: $(VNETD_OBJ)
$(CC) $(CFLAGS) -o $@ $^ $(VNETD_LIBS) -ldl -lpthread
install: vnetd
- mkdir -p $(prefix)/$(VNETD_INSTALL_DIR)
- install -m 0755 vnetd $(prefix)/$(VNETD_INSTALL_DIR)
+ mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)
+ install -m 0755 vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
clean:
-rm -f *.a *.o *~
diff --git a/tools/xfrd/Makefile b/tools/xfrd/Makefile
index 6ca1a1d12f..0b16891eaf 100644
--- a/tools/xfrd/Makefile
+++ b/tools/xfrd/Makefile
@@ -72,8 +72,8 @@ xfrd: $(XFRD_PROG_OBJ)
.PHONY: install
install: xfrd
- $(INSTALL_DIR) $(DESTDIR)/$(XFRD_INSTALL_DIR)
- $(INSTALL_PROG) xfrd $(DESTDIR)/$(XFRD_INSTALL_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(XFRD_INSTALL_DIR)
+ $(INSTALL_PROG) xfrd $(DESTDIR)$(XFRD_INSTALL_DIR)
.PHONY: libutil
libutil: $(UTIL_LIB)
diff --git a/xen/Makefile b/xen/Makefile
index fd2c06df3d..2a84ca6835 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -9,7 +9,6 @@ export XEN_SUBVERSION = 0
export XEN_EXTRAVERSION = ""
export BASEDIR := $(CURDIR)
-DESTDIR := $(CURDIR)/../dist/install
include Rules.mk
@@ -30,8 +29,6 @@ install: $(TARGET).gz
$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
-dist: install
-
clean:
$(MAKE) -C tools clean
$(MAKE) -C common clean