From ad9517722ecb7a27b760106a8b3ee931aaf2f531 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 26 Jan 2017 11:29:20 +1300
Subject: [PATCH] simplify makefile

---
 Makefile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c385889d..451d523c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ INSTALLIMG=ubuntu-server-${STREAM}-${RELEASE}-${ARCH}-installer.img
 INSTALLER_RESOURCES += $(shell find installer/resources -type f)
 PROBERTDIR=./probert
 PROBERT_REPO=git@github.com:CanonicalLtd/probert.git
-PROBERT_REVNO=xenial
 GITDEBDIR=./debian.git
 DEBDIR=./debian
 
@@ -33,14 +32,11 @@ $(NAME)_$(VERSION).orig.tar.gz: probert clean
 
 tarball: $(NAME)_$(VERSION).orig.tar.gz
 
-install_deps_amd64:
-	sudo apt-get install grub-efi-amd64-signed
-
-install_deps: install_deps_$(ARCH)
-	sudo apt-get install python3-urwid python3-pyudev python3-nose python3-flake8 python3-yaml git bzr ubuntu-cloudimage-keyring python3-coverage ovmf shim shim-signed grub-pc-bin
+install_deps:
+	sudo apt-get install python3-urwid python3-pyudev python3-nose python3-flake8 python3-yaml python3-coverage
 
 dryrun: probert
-	$(MAKE) ui-view DRYRUN="--dry-run --uefi --install"
+	$(MAKE) ui-view DRYRUN="--dry-run --uefi"
 
 ui-view:
 	(PYTHONPATH=$(PYTHONPATH) bin/$(PYTHONSRC)-tui $(DRYRUN) $(MACHARGS))
@@ -71,7 +67,7 @@ run: installer
 probert:
 	@if [ ! -d "$(PROBERTDIR)" ]; then \
 		git clone -q $(PROBERT_REPO) $(PROBERTDIR); \
-		(cd probert && git checkout -f $(PROBERT_REVNO)); \
+		(cd probert && python3 setup.py build_ext -i); \
     fi
 
 git-checkout-deb:
@@ -98,7 +94,7 @@ clean:
 	    rm -rf ../$(NAME)_*.deb ../$(NAME)_*.tar.gz ../$(NAME)_$.dsc ../$(NAME)_*.changes \
 		    ../$(NAME)_*.build ../$(NAME)_*.upload; \
 	    wrap-and-sort; \
-    fi
+	fi
 	rm -f installer/target.img
 	rm -f installer/target.img_*
 	rm -f installer/installer.img