]> xenbits.xensource.com Git - people/liuw/stubdom.git/commitdiff
Makefile: delete STUBDOMPATH target
authorWei Liu <wei.liu2@citrix.com>
Wed, 9 Mar 2016 20:12:01 +0000 (20:12 +0000)
committerWei Liu <wei.liu2@citrix.com>
Thu, 10 Mar 2016 16:06:41 +0000 (16:06 +0000)
It is used to generate a script used by toolstack to launch stubdom. It
relies paths generated when building Xen, so it should be part of
xen.git.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Makefile

index 875760ca44a7b7cd0364a0a0dde4d1cc869463eb..19b80a0683a08c3d5462c353cb3c724ecb4bbdb3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,16 +62,10 @@ TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib
 
 TARGETS=$(STUBDOM_TARGETS)
 
-STUBDOMPATH="stubdompath.sh"
-genpath-target = $(call buildmakevars2file,$(STUBDOMPATH))
-$(eval $(genpath-target))
-
 .PHONY: all
 all: build
 ifeq ($(STUBDOM_SUPPORTED),1)
-build: $(STUBDOMPATH) $(STUBDOM_BUILD)
-else
-build: $(STUBDOMPATH)
+build: $(STUBDOM_BUILD)
 endif
 
 ##############
@@ -540,15 +534,12 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore
 #########
 
 ifeq ($(STUBDOM_SUPPORTED),1)
-install: $(STUBDOMPATH) $(STUBDOM_INSTALL)
-else
-install: $(STUBDOMPATH)
+install: $(STUBDOM_INSTALL)
 endif
 
 install-ioemu: ioemu-stubdom
        $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"
        $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)"
-       $(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC_BIN)"
        $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
        $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
 
@@ -591,7 +582,6 @@ clean:
        $(MAKE) -C vtpm clean
        $(MAKE) -C vtpmmgr clean
        rm -fr grub-$(XEN_TARGET_ARCH)
-       rm -f $(STUBDOMPATH)
        [ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean
        [ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean
        [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean