--- nono/vm/Makefile	2026/04/29 17:04:28	1.1.1.1
+++ nono/vm/Makefile	2026/04/29 17:04:31	1.1.1.3
@@ -5,12 +5,12 @@
 # VM
 #
 
-TARGETS=	libnnvm.a
+TARGETS=	libnnvm.a test_busio
 
-CPPFLAGS+=	-I. -I.. -I../fpe -I../lib -I../m680x0 -I../debugger -I../host
+CPPFLAGS+=	-I../m88xx0
 CXXFLAGS+=	-mtune=native
 
-CXXSRCS=	\
+CXXSRCS_vm=	\
 	areaset.cpp \
 	bitmap.cpp \
 	bt454.cpp \
@@ -23,28 +23,35 @@ CXXSRCS=	\
 	ethernet.cpp \
 	event.cpp \
 	fdc.cpp \
+	fuserom.cpp \
 	gvram.cpp \
 	human68k.cpp \
 	keyboard.cpp \
 	lance.cpp \
 	lcd.cpp \
 	lunakbd.cpp \
-	lunarom.cpp \
 	mfp.cpp \
 	mk48t02.cpp \
 	mpu.cpp \
+	mpu680x0.cpp \
+	mpu88xx0.cpp \
 	iocon.cpp \
+	pio.cpp \
 	pluto.cpp \
-	ppi.cpp \
 	printer.cpp \
 	ram.cpp \
 	renderer.cpp \
-	rom.cpp \
+	romemu_luna.cpp \
+	romemu_luna88k.cpp \
+	romimg.cpp \
+	romimg_luna.cpp \
+	romimg_x68k.cpp \
 	rp5c15.cpp \
 	rtc.cpp \
 	scc.cpp \
 	scsi.cpp \
-	scsitarget.cpp \
+	scsibus.cpp \
+	scsidev.cpp \
 	scheduler.cpp \
 	sio.cpp \
 	spc.cpp \
@@ -56,18 +63,27 @@ CXXSRCS=	\
 	upd7201.cpp \
 	vicon.cpp \
 	vm.cpp \
+	vm_luna.cpp \
+	vm_x68k.cpp \
 	x68kkbd.cpp \
-	x68krom.cpp \
 	xiospace.cpp \
 	zram.cpp \
 
-OBJS=	${CXXSRCS:.cpp=.o}
+CXXSRCS_test=	\
+	test_busio.cpp \
+
+CXXSRCS=	${CXXSRCS_vm} ${CXXSRCS_test}
+
+OBJS_vm=	${CXXSRCS_vm:.cpp=.o}
 
 CLEANFILES+=	gencgrom
 
 .include "../Makefile.inc"
 
-libnnvm.a:	${OBJS}
+libnnvm.a:	${OBJS_vm}
 	rm -f $@
 	${AR} r $@ $>
 	${RANLIB} $@
+
+test_busio:	test_busio.o
+	${CXX} ${LDFLAGS} -o $@ $>