summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2011-09-20 20:00:41 +0000
committerRobert Mustacchi <rm@joyent.com>2011-09-20 20:00:41 +0000
commitb8a1616d8ef4ae81bb218ae08c96867ebf610f9f (patch)
tree8cace432ef106df5b1d42e7364efa79c659a4bb0
parent2db7385317ff58ef48a51848dcf3ac4533016581 (diff)
downloadillumos-kvm-b8a1616d8ef4ae81bb218ae08c96867ebf610f9f.tar.gz
HVM-660 kvm Makefile should match local spec
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index fcfbc54..1268b0f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,6 @@ HDRCHK=tools/hdrchk
HDRCHK_USRFLAG="$(GCC)"
HDRCHK_SYSFLAG="$(GCC) -D_KERNEL"
-all: kvm kvm.so JOY_kvm_link.so
-
HEADERS= \
kvm.h \
kvm_bitops.h \
@@ -69,7 +67,9 @@ HDRCHK_SYSHDRS= \
kvm_x86host.h \
kvm_x86impl.h
-kvm: kvm.c kvm_x86.c kvm_emulate.c kvm.h kvm_x86host.h kvm_msr.h kvm_bitops.h kvm_irq.c kvm_i8254.c kvm_lapic.c kvm_mmu.c kvm_iodev.c kvm_ioapic.c kvm_vmx.c kvm_i8259.c kvm_coalesced_mmio.c kvm_irq_comm.c kvm_cache_regs.c kvm_bitops.c $(HEADERS)
+world: kvm kvm.so JOY_kvm_link.so
+
+kvm: kvm.c kvm_x86.c kvm_emulate.c kvm_irq.c kvm_i8254.c kvm_lapic.c kvm_mmu.c kvm_iodev.c kvm_ioapic.c kvm_vmx.c kvm_i8259.c kvm_coalesced_mmio.c kvm_irq_comm.c kvm_cache_regs.c kvm_bitops.c $(HEADERS)
$(CC) $(CFLAGS) $(INCLUDEDIR) kvm.c
$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_x86.c
$(CC) $(CFLAGS) $(INCLUDEDIR) kvm_emulate.c
@@ -126,6 +126,9 @@ check:
@$(HDRCHK) $(HDRCHK_USRFLAG) $(HDRCHK_USRHDRS)
@$(HDRCHK) $(HDRCHK_SYSFLAG) $(HDRCHK_SYSHDRS)
+update:
+ git pull --rebase
+
clean:
@pfexec rm -f *.o kvm kvm.so JOY_kvm_link.so