inmates: Build library archive and link it implicitly

[jailhouse.git] / inmates / demos / x86 / Makefile

diff --git a/inmates/demos/x86/Makefile b/inmates/demos/x86/Makefile
index 2a96bd9848485c658cc9bef79d4fa20bc42fa286..110501f0e7e5c54bc7a848cd7b1e0a218a2f94a5 100644 (file)
--- a/inmates/demos/x86/Makefile
+++ b/inmates/demos/x86/Makefile
@@ -12,36 +12,17 @@
 
 include $(INMATES_LIB)/Makefile.lib
 
-LIBDIR := ../../lib/x86
-
 INMATES := tiny-demo.bin apic-demo.bin ioapic-demo.bin 32-bit-demo.bin \
        pci-demo.bin e1000-demo.bin ivshmem-demo.bin
 
-tiny-demo-y := tiny-demo.o \
-       $(LIBDIR)/header.o $(LIBDIR)/printk.o $(LIBDIR)/timing.o
-
-apic-demo-y := apic-demo.o \
-       $(LIBDIR)/header.o $(LIBDIR)/printk.o $(LIBDIR)/timing.o \
-       $(LIBDIR)/int.o
-
-ioapic-demo-y := ioapic-demo.o \
-       $(LIBDIR)/header.o $(LIBDIR)/printk.o $(LIBDIR)/mem.o \
-       $(LIBDIR)/int.o $(LIBDIR)/ioapic.o
+tiny-demo-y    := tiny-demo.o
+apic-demo-y    := apic-demo.o
+ioapic-demo-y  := ioapic-demo.o
+pci-demo-y     := pci-demo.o
+e1000-demo-y   := e1000-demo.o
+ivshmem-demo-y := ivshmem-demo.o
 
 $(eval $(call DECLARE_32_BIT,32-bit-demo))
-32-bit-demo-y := 32-bit-demo.o \
-       $(LIBDIR)/header-32.o $(LIBDIR)/printk-32.o
-
-pci-demo-y := pci-demo.o \
-       $(LIBDIR)/header.o $(LIBDIR)/printk.o $(LIBDIR)/mem.o \
-       $(LIBDIR)/int.o $(LIBDIR)/pci.o $(LIBDIR)/timing.o
-
-e1000-demo-y := e1000-demo.o \
-       $(LIBDIR)/header.o $(LIBDIR)/printk.o $(LIBDIR)/mem.o \
-       $(LIBDIR)/pci.o $(LIBDIR)/timing.o
-
-ivshmem-demo-y := ivshmem-demo.o \
-       $(LIBDIR)/header.o $(LIBDIR)/printk.o $(LIBDIR)/mem.o \
-       $(LIBDIR)/int.o $(LIBDIR)/pci.o $(LIBDIR)/timing.o
+32-bit-demo-y  := 32-bit-demo.o
 
 $(eval $(call DECLARE_TARGETS,$(INMATES)))