Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / Makefile.hw

diff --git a/Makefile.hw b/Makefile.hw
index a8c7174..6accb3b 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -11,7 +11,7 @@ VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS)
 LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS)
 
-CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
+CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-I$(SRC_PATH)/fpu
 
@@ -21,11 +21,16 @@ OBJS+= fw_cfg.o
 OBJS+= watchdog.o
 OBJS+= nand.o ecc.o
 
-OBJS+= m48t59.o
+OBJS+= m48t59.o escc.o
+
+# SCSI layer
+OBJS+= lsi53c895a.o esp.o
 
 OBJS+= dma-helpers.o sysbus.o
 
 all: $(HWLIB)
+# Dummy command so that make thinks it has done something
+       @true
 
 $(HWLIB): $(OBJS)