ia64/xen-unstable

changeset 4109:3ee85723a341

bitkeeper revision 1.1159.270.3 (42330ae8efsd9SdlhNX6EpksrtV6oQ)

[PATCH] add-build.patch

Add build targets to all makefiles. Debian does builds as non-root, so
it's better to do as much as possible before requiring root privs.
Signed-off-by: Adam Heath <doogie@brainfood.com>
author doogie@brainfood.com[kaf24]
date Sat Mar 12 15:29:44 2005 +0000 (2005-03-12)
parents 4d7f2d346576
children 0865d1223c52
files Makefile docs/Makefile tools/Makefile tools/examples/Makefile tools/libxc/Makefile tools/libxutil/Makefile tools/misc/Makefile tools/python/Makefile tools/xentrace/Makefile tools/xfrd/Makefile xen/Makefile
line diff
     1.1 --- a/Makefile	Sat Mar 12 15:28:18 2005 +0000
     1.2 +++ b/Makefile	Sat Mar 12 15:29:44 2005 +0000
     1.3 @@ -37,6 +37,11 @@ all: dist
     1.4  # build and install everything into the standard system directories
     1.5  install: install-xen install-tools install-kernels install-docs
     1.6  
     1.7 +build: kernels
     1.8 +	$(MAKE) -C xen build
     1.9 +	$(MAKE) -C tools build
    1.10 +	$(MAKE) -C docs build
    1.11 +
    1.12  # build and install everything into local dist directory
    1.13  dist: xen tools kernels docs
    1.14  	$(INSTALL_DIR) $(DISTDIR)/check
     2.1 --- a/docs/Makefile	Sat Mar 12 15:28:18 2005 +0000
     2.2 +++ b/docs/Makefile	Sat Mar 12 15:29:44 2005 +0000
     2.3 @@ -18,7 +18,8 @@ DOC_HTML	:= $(patsubst src/%.tex,html/%/
     2.4  
     2.5  GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
     2.6  
     2.7 -all: ps pdf html
     2.8 +all: build
     2.9 +build: ps pdf html
    2.10  	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
    2.11  
    2.12  ps: $(DOC_PS)
     3.1 --- a/tools/Makefile	Sat Mar 12 15:28:18 2005 +0000
     3.2 +++ b/tools/Makefile	Sat Mar 12 15:29:44 2005 +0000
     3.3 @@ -20,13 +20,13 @@ install:
     3.4  	$(MAKE) -C xfrd install
     3.5  	$(MAKE) -C sv install
     3.6  
     3.7 -clean:
     3.8 -	$(MAKE) -C check clean
     3.9 -	$(MAKE) -C libxutil clean
    3.10 -	$(MAKE) -C libxc clean
    3.11 -	$(MAKE) -C misc clean
    3.12 -	$(MAKE) -C examples clean
    3.13 -	$(MAKE) -C xentrace clean
    3.14 -	$(MAKE) -C python clean
    3.15 -	$(MAKE) -C xfrd clean
    3.16 +clean build:
    3.17 +	$(MAKE) -C check $@
    3.18 +	$(MAKE) -C libxutil $@
    3.19 +	$(MAKE) -C libxc $@
    3.20 +	$(MAKE) -C misc $@
    3.21 +	$(MAKE) -C examples $@
    3.22 +	$(MAKE) -C xentrace $@
    3.23 +	$(MAKE) -C python $@
    3.24 +	$(MAKE) -C xfrd $@
    3.25  
     4.1 --- a/tools/examples/Makefile	Sat Mar 12 15:28:18 2005 +0000
     4.2 +++ b/tools/examples/Makefile	Sat Mar 12 15:29:44 2005 +0000
     4.3 @@ -21,6 +21,7 @@ XEN_SCRIPTS += block-file
     4.4  XEN_SCRIPTS += block-enbd
     4.5  
     4.6  all: 
     4.7 +build:
     4.8  
     4.9  install: all install-initd install-configs install-scripts
    4.10  
     5.1 --- a/tools/libxc/Makefile	Sat Mar 12 15:28:18 2005 +0000
     5.2 +++ b/tools/libxc/Makefile	Sat Mar 12 15:29:44 2005 +0000
     5.3 @@ -44,7 +44,8 @@ PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS
     5.4  
     5.5  LIB      := libxc.a libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
     5.6  
     5.7 -all: check-for-zlib mk-symlinks
     5.8 +all: build
     5.9 +build: check-for-zlib mk-symlinks
    5.10  	$(MAKE) $(LIB)
    5.11  
    5.12  check-for-zlib:
    5.13 @@ -66,7 +67,7 @@ mk-symlinks:
    5.14  	( cd xen/linux >/dev/null ; \
    5.15  	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
    5.16  
    5.17 -install: all
    5.18 +install: build
    5.19  	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
    5.20  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
    5.21  	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
    5.22 @@ -78,7 +79,7 @@ install: all
    5.23  clean:
    5.24  	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
    5.25  
    5.26 -rpm: all
    5.27 +rpm: build
    5.28  	rm -rf staging
    5.29  	mkdir staging
    5.30  	mkdir staging/i386
     6.1 --- a/tools/libxutil/Makefile	Sat Mar 12 15:28:18 2005 +0000
     6.2 +++ b/tools/libxutil/Makefile	Sat Mar 12 15:29:44 2005 +0000
     6.3 @@ -40,7 +40,8 @@ LIB      += libxutil.so.$(MAJOR)
     6.4  LIB      += libxutil.so.$(MAJOR).$(MINOR)
     6.5  LIB      += libxutil.a
     6.6  
     6.7 -all: check-for-zlib
     6.8 +all: build
     6.9 +build: check-for-zlib
    6.10  	$(MAKE) $(LIB)
    6.11  
    6.12  libxutil.so: libxutil.so.$(MAJOR)
    6.13 @@ -63,7 +64,7 @@ check-for-zlib:
    6.14  	false; \
    6.15  	fi
    6.16  
    6.17 -install: all
    6.18 +install: build
    6.19  	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
    6.20  	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
    6.21  	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib
     7.1 --- a/tools/misc/Makefile	Sat Mar 12 15:28:18 2005 +0000
     7.2 +++ b/tools/misc/Makefile	Sat Mar 12 15:29:44 2005 +0000
     7.3 @@ -19,10 +19,11 @@ TARGETS  = xenperf
     7.4  INSTALL_BIN  = $(TARGETS) xencons
     7.5  INSTALL_SBIN = netfix xm xend xensv xenperf
     7.6  
     7.7 -all: $(TARGETS)
     7.8 +all: build
     7.9 +build: $(TARGETS)
    7.10  	$(MAKE) -C miniterm
    7.11  
    7.12 -install: all
    7.13 +install: build
    7.14  	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
    7.15  	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
    7.16  	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
     8.1 --- a/tools/python/Makefile	Sat Mar 12 15:28:18 2005 +0000
     8.2 +++ b/tools/python/Makefile	Sat Mar 12 15:29:44 2005 +0000
     8.3 @@ -2,7 +2,8 @@
     8.4  XEN_ROOT = ../..
     8.5  include $(XEN_ROOT)/tools/Rules.mk
     8.6  
     8.7 -all:
     8.8 +all: build
     8.9 +build:
    8.10  	CFLAGS="$(CFLAGS)" python setup.py build
    8.11  
    8.12  install: all
     9.1 --- a/tools/xentrace/Makefile	Sat Mar 12 15:28:18 2005 +0000
     9.2 +++ b/tools/xentrace/Makefile	Sat Mar 12 15:29:44 2005 +0000
     9.3 @@ -21,9 +21,10 @@ SCRIPTS  = xentrace_format
     9.4  MAN1     = $(wildcard *.1)
     9.5  MAN8     = $(wildcard *.8)
     9.6  
     9.7 -all: $(BIN)
     9.8 +all: build
     9.9 +build: $(BIN)
    9.10  
    9.11 -install: all
    9.12 +install: build
    9.13  	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
    9.14  	[ -d $(DESTDIR)/usr/man/man1 ] || \
    9.15  		$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
    10.1 --- a/tools/xfrd/Makefile	Sat Mar 12 15:28:18 2005 +0000
    10.2 +++ b/tools/xfrd/Makefile	Sat Mar 12 15:29:44 2005 +0000
    10.3 @@ -63,7 +63,8 @@ XFRD_LIBS += $(CURL_LIBS)
    10.4  
    10.5  #$(warning XFRD_LIBS = $(XFRD_LIBS))
    10.6  
    10.7 -all: xfrd
    10.8 +all: build
    10.9 +build: xfrd
   10.10  
   10.11  xfrd: $(XFRD_PROG_OBJ)
   10.12  	$(CC) -o $@ $^ $(XFRD_LIBS)
    11.1 --- a/xen/Makefile	Sat Mar 12 15:28:18 2005 +0000
    11.2 +++ b/xen/Makefile	Sat Mar 12 15:29:44 2005 +0000
    11.3 @@ -16,7 +16,7 @@ export BASEDIR          := $(CURDIR)
    11.4  
    11.5  include Rules.mk
    11.6  
    11.7 -default: $(TARGET).gz
    11.8 +default: build
    11.9  $(TARGET).gz: $(TARGET)
   11.10  	gzip -f -9 < $< > $@.new
   11.11  	mv $@.new $@
   11.12 @@ -24,9 +24,10 @@ default: $(TARGET).gz
   11.13  debug:	
   11.14  	objdump -D -S $(TARGET)-syms > $(TARGET).s
   11.15  
   11.16 -dist:
   11.17 -	$(MAKE) install
   11.18 +dist: install
   11.19  
   11.20 +build: $(TARGET).gz
   11.21 +	
   11.22  install: $(TARGET).gz
   11.23  	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
   11.24  	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot