diff options
| -rw-r--r-- | docs/Makefile | 4 | ||||
| -rwxr-xr-x | netbsd-2.0-xen-sparse/nbconfig-xen | 2 | ||||
| -rwxr-xr-x | netbsd-2.0-xen-sparse/nbmake-xen | 2 | ||||
| -rw-r--r-- | tools/libxc/Makefile | 3 | ||||
| -rw-r--r-- | tools/libxutil/Makefile | 3 | ||||
| -rw-r--r-- | xen/Makefile | 21 |
6 files changed, 15 insertions, 20 deletions
diff --git a/docs/Makefile b/docs/Makefile index 528c4f53f2..aa2b8a1aee 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -30,10 +30,10 @@ install: all pdf/%.pdf: ps/%.ps mkdir -p pdf ; ps2pdf $< $@ -ps/%.ps: %.dvi $(GFX) +ps/%.ps: %.dvi mkdir -p ps ; dvips -Ppdf -G0 -o $@ $< -%.dvi: src/%.tex +%.dvi: src/%.tex $(GFX) latex $< >/dev/null if [ -e $*.toc ] ; then latex $< >/dev/null ; fi diff --git a/netbsd-2.0-xen-sparse/nbconfig-xen b/netbsd-2.0-xen-sparse/nbconfig-xen index 23c33c7ac2..2bd5a77cef 100755 --- a/netbsd-2.0-xen-sparse/nbconfig-xen +++ b/netbsd-2.0-xen-sparse/nbconfig-xen @@ -2,7 +2,7 @@ # : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)} -: ${HARCH:=$(uname -i)} +: ${HARCH:=$(uname -i 2>/dev/null || echo i386)} : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')} : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')} : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')} diff --git a/netbsd-2.0-xen-sparse/nbmake-xen b/netbsd-2.0-xen-sparse/nbmake-xen index 64cb7a5c38..6854538905 100755 --- a/netbsd-2.0-xen-sparse/nbmake-xen +++ b/netbsd-2.0-xen-sparse/nbmake-xen @@ -4,7 +4,7 @@ # : ${HOS:=$(uname -s | tr /A-Z/ /a-z/)} -: ${HARCH:=$(uname -i)} +: ${HARCH:=$(uname -i 2>/dev/null || echo i386)} : ${NETBSD_RELEASE:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+\).*/\1/')} : ${NETBSD_VERSION:=$(basename $(cd $(dirname $0) && pwd) | sed 's/netbsd-\([0-9]\+\.[0-9]\+.*\)-xen.*/\1/')} : ${TOPDIR:=$(cd $(dirname $0) && pwd | sed 's/\(netbsd-[0-9]\+\.[0-9]\+.*-xen[^/]*\)/\1/')} diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 248c70500c..78ba7f3bf3 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -38,7 +38,8 @@ OBJS = $(patsubst %.c,%.o,$(SRCS)) LIB = libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR) -all: check-for-zlib mk-symlinks $(LIB) +all: check-for-zlib mk-symlinks + $(MAKE) $(LIB) check-for-zlib: @if [ ! -e /usr/include/zlib.h ]; then \ diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile index ec453f1af8..6986c96e79 100644 --- a/tools/libxutil/Makefile +++ b/tools/libxutil/Makefile @@ -30,7 +30,8 @@ LIB := $(LIB_NAME).so LIB += $(LIB_NAME).so.$(MAJOR) LIB += $(LIB_NAME).so.$(MAJOR).$(MINOR) -all: check-for-zlib $(LIB) +all: check-for-zlib + $(MAKE) $(LIB) $(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR) ln -sf $^ $@ diff --git a/xen/Makefile b/xen/Makefile index e47e2ea8a6..209c7adc1e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -9,8 +9,6 @@ export BASEDIR := $(shell pwd) include Rules.mk -GENERATED_FILES := include/xen/compile.h - default: $(TARGET) gzip -f -9 < $(TARGET) > $(TARGET).gz @@ -30,27 +28,23 @@ install: $(TARGET) dist: $(TARGET) $(MAKE) prefix=`pwd`/../install dist=yes install -clean: delete-links +clean: $(MAKE) -C figlet clean $(MAKE) -C common clean $(MAKE) -C drivers clean $(MAKE) -C arch/$(TARGET_ARCH) clean - rm -f *.o $(TARGET)* *~ core $(GENERATED_FILES) + rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h -$(TARGET): delete-unfresh-files make-links $(GENERATED_FILES) +$(TARGET): delete-unfresh-files + [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm + $(MAKE) include/xen/compile.h $(MAKE) -C common $(MAKE) -C drivers $(MAKE) -C arch/$(TARGET_ARCH) -make-links: delete-links - ln -sf asm-$(TARGET_ARCH) include/asm - -delete-links: - rm -f include/asm - # Blow away kernel.o because build info is stored statically within it. delete-unfresh-files: - rm -f $(GENERATED_FILES) common/kernel.o + rm -f include/xen/compile.h common/kernel.o # compile.h contains dynamic build info. Rebuilt on every 'make' invocation. include/xen/compile.h: @@ -71,8 +65,7 @@ include/xen/compile.h: cd ./figlet && make && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../$@ && cd .. @LANG=C echo >> $@ -.PHONY: $(GENERATED_FILES) make-links delete-links default -.PHONY: debug install clean delete-unfresh-files TAGS +.PHONY: default debug install dist clean delete-unfresh-files TAGS SUBDIRS = arch common drivers TAGS: |