X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=ad4787ff4aed3e51c2cdaf53fa6aef3238e5a43a;hb=e9e3ee43cb302909917b5919f6043347b73c6995;hp=40593da616340201802ce32048d36c61bff9af11;hpb=c2e660b41f69c603b0c47f7c7572a22a2f601a51;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 40593da..ad4787f 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -254,11 +254,11 @@ ALL_TARGETS := vmm vm_kernel
 
 
 
-VMM_ASM_SRCS :=  svm_lowlevel.asm vmm_lowlevel.asm\
-#			vmx_lowlevel.asm
-
+VMM_ASM_SRCS :=
 VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o)
 
+VMM_GAS_SRCS := svm_lowlevel.s
+VMM_GAS_OBJS := $(VMM_GAS_SRCS:%.s=palacios/%.o)
 
 VMM_C_SRCS :=   vm_guest.c \
 	 	svm.c svm_handler.c vmm.c vmm_util.c vmm_ctrl_regs.c \
@@ -275,23 +275,21 @@ VMM_C_SRCS :=   vm_guest.c \
 
 VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o)
 
-VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
+VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS) $(VMM_GAS_OBJS)
 
 
 
 XED_C_SRCS := v3-xed-compat.c
-
 XED_C_OBJS := $(XED_C_SRCS:%.c=xed/%.o)
 
 XED_GAS_SRCS := v3-udiv-compat.s
-
 XED_GAS_OBJS := $(XED_GAS_SRCS:%.s=xed/%.o)
 
 XED_OBJS := $(XED_C_OBJS) $(XED_GAS_OBJS)
 
 
 
-DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c
+DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c bochs_debug.c
 
 DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
 
@@ -340,6 +338,9 @@ TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
 #NASM := /opt/vmm-tools/bin/nasm
 
+CPP := cpp
+
+
 AS = as --32
 
 # Tool to build PFAT filesystem images.
@@ -397,6 +398,11 @@ palacios/%.o : palacios/%.c
 palacios/%.o : palacios/%.asm
 	$(NASM) $(NASM_VMM_OPTS) $< -o palacios/$*.o
 
+palacios/%.o : palacios/%.S
+	$(CPP) $(CC_VMM_OPTS) $< | $(AS) -o palacios/$*.o
+
+
+
 devices/%.o : devices/%.c
 	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o devices/$*.o