[Xen-changelog] Clean up xen Makefile. Use _-prefixed rules to avoid a

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c9d706834d25a9efe5bd3a98cbf32c6998f30ab4
# Parent  4f0ecc016cd1ebda3bff176c8c01113c35b05c7b
Clean up xen Makefile. Use _-prefixed rules to avoid a
comparsion with XEN_ROOT variable.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 4f0ecc016cd1 -r c9d706834d25 xen/Makefile
--- a/xen/Makefile      Thu Apr 13 09:45:43 2006
+++ b/xen/Makefile      Thu Apr 13 09:57:57 2006
@@ -10,19 +10,22 @@
 .PHONY: default
 default: build
 
-ifeq ($(XEN_ROOT),)
+.PHONY: dist
+dist: install
 
-.PHONY: build install clean
-build install clean:
-       make -f Rules.mk $@
+.PHONY: debug
+debug:
+       objdump -D -S $(TARGET)-syms > $(TARGET).s
 
-else
+.PHONY: build install clean cscope TAGS tags
+build install clean cscope TAGS tags::
+       make -f Rules.mk _$@
 
-.PHONY: build
-build: $(TARGET).gz
+.PHONY: _build
+_build: $(TARGET).gz
 
-.PHONY: install
-install: $(TARGET).gz
+.PHONY: _install
+_install: $(TARGET).gz
        [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
        $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir 
$(TARGET))-$(XEN_FULLVERSION).gz
        ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz 
$(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz
@@ -35,8 +38,8 @@
        $(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
        $(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
 
-.PHONY: clean
-clean:: delete-unfresh-files
+.PHONY: _clean
+_clean: delete-unfresh-files
        $(MAKE) -C tools clean
        $(MAKE) -f $(BASEDIR)/Rules.mk -C common clean
        $(MAKE) -f $(BASEDIR)/Rules.mk -C drivers clean
@@ -45,15 +48,6 @@
        rm -f include/asm *.o $(TARGET)* *~ core
        rm -f include/asm-*/asm-offsets.h
        rm -f include/xen/acm_policy.h
-
-endif
-
-.PHONY: dist
-dist: install
-
-.PHONY: debug
-debug:
-       objdump -D -S $(TARGET)-syms > $(TARGET).s
 
 $(TARGET).gz: $(TARGET)
        gzip -f -9 < $< > $@.new
@@ -135,10 +129,6 @@
       find $(SUBDIRS) -name SCCS -prune -o -name '*.[chS]' -print )
 endef
 
-.PHONY: cscope TAGS tags
-cscope TAGS tags:
-       make -f $(BASEDIR)/Rules.mk _$@
-
 .PHONY: _TAGS
 _TAGS: 
        $(all_sources) | etags -

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog