X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=aa8d8b47d62dd6a4ae5ffd1242b92f5506fb3cb0;hb=75605bd63002a1740b04a198c1ad9b7a65f74fd9;hp=ad3fcdf1be66d632d5f41530a6ab00ee1c169660;hpb=1fd8358e3af30b4b34bbc28dc64ce1b11a001429;p=virt-p2v.git

diff --git a/Makefile.in b/Makefile.in
index ad3fcdf..aa8d8b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ HAVE_PERLDOC	:= @HAVE_PERLDOC@
 HAVE_QEMU	:= @HAVE_QEMU@
 HAVE_QEMU_KVM	:= @HAVE_QEMU_KVM@
 HAVE_LIVECD_CREATOR := @HAVE_LIVECD_CREATOR@
+HAVE_LIVECD_ISO_TO_PXEBOOT := @HAVE_LIVECD_ISO_TO_PXEBOOT@
 
 LABEL		:= $(PACKAGE)-$(VERSION)
 ISO		:= $(LABEL).iso
@@ -42,6 +43,7 @@ all:
 	@echo "                 Boot built/named ISO (uses qemu)"
 	@echo "make update    Update an existing live CD ISO with new"
 	@echo "                 virt-p2v script, without doing full rebuild"
+	@echo "make pxe       Build a PXE image (in tftpboot/ subdirectory)"
 	@echo "make man       Make man pages (needs POD)"
 
 # Build live CD.
@@ -84,9 +86,18 @@ endif
 # Update an existing ISO.
 
 update: checkroot checkscript
-	-./iso-attach delete $(ISO)
+	-./iso-attach delete $(ISO) 2>/dev/null
 	./iso-attach add $(ISO) virt-p2v
 
+# PXE boot.
+
+ifeq ($(HAVE_LIVECD_ISO_TO_PXEBOOT),livecd-iso-to-pxeboot)
+
+pxe: checkroot checkscript
+	livecd-iso-to-pxeboot $(ISO)
+
+endif
+
 # Check that we are root.
 
 checkroot:
@@ -103,7 +114,13 @@ checkscript:
 # Clean.
 
 clean:
-	rm -f *~ core livecd.ks livecd-post.sh
+	rm -f *~ core p2v.ks pod2htm*
+
+distclean: clean
+	rm -rf autom4te.cache config.log config.status configure
+
+reallyreallyclean: distclean
+	rm -f virt-p2v-*.tar.gz virt-p2v-*.iso
 
 # Manifest.
 
@@ -152,9 +169,22 @@ website: man dist
 	cp virt-p2v.1.css $(WEBSITE_DIR)
 	cp $(PACKAGE)-$(VERSION).tar.gz $(WEBSITE_DIR)
 
+# Upload everything.
+
+upload: upload_iso upload_pxe
+
 # Upload ISO.
 
 upload_iso:
 	scp -l 300 $(ISO) et.redhat.com:public_html/tmp/
 
+# Upload PXE image.
+
+PXE_TAR := $(PACKAGE)-$(VERSION)-pxeboot.tar
+
+upload_pxe:
+	tar cf $(PXE_TAR) tftpboot
+	scp -l 300 $(PXE_TAR) et.redhat.com:public_html/tmp/
+	rm $(PXE_TAR)
+
 .PHONY:	build boot checkroot
\ No newline at end of file