Add .gitignore file for git.

[virt-p2v.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1e7dd60..89e6474 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,7 @@ VIRTP2V_RPM     := $(PACKAGE)-$(VERSION)-1.noarch.rpm
 all:
        @echo "make rpm       Build the virt-p2v RPM"
        @echo "make build     Build the live CD ISO"
-       @echo "make boot [HDA=hda.img] [HDB=hdb.img] [ISO=livecd.iso]"
+       @echo "make boot [HDA=hda.img] [HDB=hdb.img] [ISO=livecd.iso] [SERIAL=yes]"
        @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"
@@ -74,7 +74,7 @@ RPM_FLAGS := --define "_topdir       %(pwd)/rpmbuild" \
 p2vrepo/$(VIRTP2V_RPM): \
                virt-p2v.spec \
                virt-p2v virt-p2v-update-wrapper iso-attach \
-               inittab
+               inittab tty1
        $(MAKE) dist
        rm -rf rpmbuild
        mkdir rpmbuild rpmbuild/{RPMS,BUILD,SRPMS,SPECS} rpmbuild/RPMS/noarch
@@ -83,12 +83,6 @@ p2vrepo/$(VIRTP2V_RPM): \
        cp rpmbuild/RPMS/noarch/$(VIRTP2V_RPM) p2vrepo
        createrepo p2vrepo
 
-# Make the final script.
-
-virt-p2v: virt-p2v.ml0 virt-p2v.ml
-       cat $^ > $@
-       chmod 0555 $@
-
 # Run live CD under qemu.
 
 ifeq ($(HAVE_QEMU_KVM),qemu-kvm)
@@ -110,6 +104,8 @@ endif
 ifneq ($(HDB),)
 QEMU_ARGS += -hdb $(HDB)
 endif
+SERIAL    = none
+QEMU_ARGS += -serial $(SERIAL)
 
 boot:
        $(QEMU) $(QEMU_ARGS)
@@ -155,12 +151,12 @@ checkscript:
 # Check that the RPM has been built.
 
 checkrpm:
-       test -f rpmbuild/$(VIRTP2V_RPM)
+       test -f p2vrepo/$(VIRTP2V_RPM)
 
 # Clean.
 
 clean:
-       rm -f *~ core virt-p2v pod2htm*
+       rm -f core *~ pod2htm*
 
 distclean: clean
        rm -rf autom4te.cache config.log config.status configure \