diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | docs/Makefile | 3 | ||||
| -rw-r--r-- | tools/Makefile | 18 | ||||
| -rw-r--r-- | tools/examples/Makefile | 1 | ||||
| -rw-r--r-- | tools/libxc/Makefile | 7 | ||||
| -rw-r--r-- | tools/libxutil/Makefile | 5 | ||||
| -rw-r--r-- | tools/misc/Makefile | 5 | ||||
| -rw-r--r-- | tools/python/Makefile | 3 | ||||
| -rw-r--r-- | tools/xentrace/Makefile | 5 | ||||
| -rw-r--r-- | tools/xfrd/Makefile | 3 | ||||
| -rw-r--r-- | xen/Makefile | 7 |
11 files changed, 38 insertions, 24 deletions
@@ -37,6 +37,11 @@ all: dist # 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 diff --git a/docs/Makefile b/docs/Makefile index 8b968dc87e..117e63ce4f 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -18,7 +18,8 @@ DOC_HTML := $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX)) 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) diff --git a/tools/Makefile b/tools/Makefile index 0140f8baae..c582a014d0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -20,13 +20,13 @@ install: $(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 $@ diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 72c1f610eb..5957a422b9 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -21,6 +21,7 @@ XEN_SCRIPTS += block-file XEN_SCRIPTS += block-enbd all: +build: install: all install-initd install-configs install-scripts diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 01fd926cf4..a254f3f396 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -44,7 +44,8 @@ PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS)) 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 @@ mk-symlinks: ( 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 @@ install: all clean: rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen -rpm: all +rpm: build rm -rf staging mkdir staging mkdir staging/i386 diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile index a9be3e3977..95e8597b3e 100644 --- a/tools/libxutil/Makefile +++ b/tools/libxutil/Makefile @@ -40,7 +40,8 @@ LIB += libxutil.so.$(MAJOR) 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 @@ check-for-zlib: 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 diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 39bfc424e6..7bfe0fad6b 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -19,10 +19,11 @@ TARGETS = xenperf 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 diff --git a/tools/python/Makefile b/tools/python/Makefile index 7d152e12ae..3a42f6047f 100644 --- a/tools/python/Makefile +++ b/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: all diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 5ed26cf795..3ee097ee31 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -21,9 +21,10 @@ SCRIPTS = xentrace_format 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 diff --git a/tools/xfrd/Makefile b/tools/xfrd/Makefile index 4cdc810e95..fb6f2ae244 100644 --- a/tools/xfrd/Makefile +++ b/tools/xfrd/Makefile @@ -63,7 +63,8 @@ XFRD_LIBS += $(CURL_LIBS) #$(warning XFRD_LIBS = $(XFRD_LIBS)) -all: xfrd +all: build +build: xfrd xfrd: $(XFRD_PROG_OBJ) $(CC) -o $@ $^ $(XFRD_LIBS) diff --git a/xen/Makefile b/xen/Makefile index 04ce606de5..7593e017fa 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -16,7 +16,7 @@ export BASEDIR := $(CURDIR) include Rules.mk -default: $(TARGET).gz +default: build $(TARGET).gz: $(TARGET) gzip -f -9 < $< > $@.new mv $@.new $@ @@ -24,9 +24,10 @@ $(TARGET).gz: $(TARGET) 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 |