<doogie@brainfood.com>
2005-Mar-11 23:28 UTC
[Xen-devel] Patch [2/4] Debian-2.0.5-1 add-build.patch
Name: add-build.patch Depends: python-install.patch Description: add build targets 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> DiffStat: Makefile | 5 +++++ docs/Makefile | 3 ++- tools/Makefile | 18 +++++++++--------- tools/examples/Makefile | 1 + tools/libxc/Makefile | 7 ++++--- tools/libxutil/Makefile | 5 +++-- tools/misc/Makefile | 5 +++-- tools/python/Makefile | 3 ++- tools/xentrace/Makefile | 5 +++-- tools/xfrd/Makefile | 3 ++- xen/Makefile | 7 ++++--- 11 files changed, 38 insertions(+), 24 deletions(-) --- xen-2.0.5.orig/tools/examples/Makefile +++ xen-2.0.5/tools/examples/Makefile @@ -21,6 +21,7 @@ XEN_SCRIPTS += block-enbd all: +build: install: all install-initd install-configs install-scripts --- xen-2.0.5.orig/tools/python/Makefile +++ xen-2.0.5/tools/python/Makefile @@ -2,7 +2,8 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk -all: +all: build +build: CFLAGS="$(CFLAGS)" python setup.py build install: build --- xen-2.0.5.orig/tools/libxutil/Makefile +++ xen-2.0.5/tools/libxutil/Makefile @@ -40,7 +40,8 @@ LIB += libxutil.so.$(MAJOR).$(MINOR) LIB += libxutil.a -all: check-for-zlib +all: build +build: check-for-zlib $(MAKE) $(LIB) libxutil.so: libxutil.so.$(MAJOR) @@ -63,7 +64,7 @@ false; \ fi -install: all +install: build [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib --- xen-2.0.5.orig/tools/libxc/Makefile +++ xen-2.0.5/tools/libxc/Makefile @@ -44,7 +44,8 @@ LIB := libxc.a libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR) -all: check-for-zlib mk-symlinks +all: build +build: check-for-zlib mk-symlinks $(MAKE) $(LIB) check-for-zlib: @@ -66,7 +67,7 @@ ( cd xen/linux >/dev/null ; \ ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . ) -install: all +install: build [ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include $(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib @@ -78,7 +79,7 @@ clean: rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen -rpm: all +rpm: build rm -rf staging mkdir staging mkdir staging/i386 --- xen-2.0.5.orig/tools/misc/Makefile +++ xen-2.0.5/tools/misc/Makefile @@ -19,10 +19,11 @@ INSTALL_BIN = $(TARGETS) xencons INSTALL_SBIN = netfix xm xend xensv xenperf -all: $(TARGETS) +all: build +build: $(TARGETS) $(MAKE) -C miniterm -install: all +install: build [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin --- xen-2.0.5.orig/tools/xentrace/Makefile +++ xen-2.0.5/tools/xentrace/Makefile @@ -21,9 +21,10 @@ MAN1 = $(wildcard *.1) MAN8 = $(wildcard *.8) -all: $(BIN) +all: build +build: $(BIN) -install: all +install: build [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin [ -d $(DESTDIR)/usr/man/man1 ] || \ $(INSTALL_DIR) $(DESTDIR)/usr/man/man1 --- xen-2.0.5.orig/tools/xfrd/Makefile +++ xen-2.0.5/tools/xfrd/Makefile @@ -63,7 +63,8 @@ #$(warning XFRD_LIBS = $(XFRD_LIBS)) -all: xfrd +all: build +build: xfrd xfrd: $(XFRD_PROG_OBJ) $(CC) -o $@ $^ $(XFRD_LIBS) --- xen-2.0.5.orig/tools/Makefile +++ xen-2.0.5/tools/Makefile @@ -20,13 +20,13 @@ $(MAKE) -C xfrd install $(MAKE) -C sv install -clean: - $(MAKE) -C check clean - $(MAKE) -C libxutil clean - $(MAKE) -C libxc clean - $(MAKE) -C misc clean - $(MAKE) -C examples clean - $(MAKE) -C xentrace clean - $(MAKE) -C python clean - $(MAKE) -C xfrd clean +clean build: + $(MAKE) -C check $@ + $(MAKE) -C libxutil $@ + $(MAKE) -C libxc $@ + $(MAKE) -C misc $@ + $(MAKE) -C examples $@ + $(MAKE) -C xentrace $@ + $(MAKE) -C python $@ + $(MAKE) -C xfrd $@ --- xen-2.0.5.orig/xen/Makefile +++ xen-2.0.5/xen/Makefile @@ -16,7 +16,7 @@ include Rules.mk -default: $(TARGET).gz +default: build $(TARGET).gz: $(TARGET) gzip -f -9 < $< > $@.new mv $@.new $@ @@ -24,9 +24,10 @@ debug: objdump -D -S $(TARGET)-syms > $(TARGET).s -dist: - $(MAKE) install +dist: install +build: $(TARGET).gz + install: $(TARGET).gz [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot --- xen-2.0.5.orig/docs/Makefile +++ xen-2.0.5/docs/Makefile @@ -18,7 +18,8 @@ GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig)) -all: ps pdf html +all: build +build: ps pdf html rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc ps: $(DOC_PS) --- xen-2.0.5.orig/Makefile +++ xen-2.0.5/Makefile @@ -37,6 +37,11 @@ # build and install everything into the standard system directories install: install-xen install-tools install-kernels install-docs +build: kernels + $(MAKE) -C xen build + $(MAKE) -C tools build + $(MAKE) -C docs build + # build and install everything into local dist directory dist: xen tools kernels docs $(INSTALL_DIR) $(DISTDIR)/check ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ Xen-devel mailing list Xen-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xen-devel