--- nono/vm/Makefile	2026/04/29 17:04:35	1.1.1.4
+++ nono/vm/Makefile	2026/04/29 17:05:20	1.1.1.13
@@ -10,72 +10,108 @@
 
 .include "../Makefile.inc"
 
-TARGETS=	libnnvm.a test_busio
+TARGETS=	libnnvm.a
+.if !defined(NOTEST)
+TARGETS+=	test_busio
+.endif
 
 CXXSRCS_vm=	\
-	areaset.cpp \
-	bitmap.cpp \
-	bt454.cpp \
-	bus.cpp \
-	cgrom.cpp \
-	cmmu.cpp \
-	crtc.cpp \
-	crtc2.cpp \
-	device.cpp \
-	dmac.cpp \
-	ethernet.cpp \
-	event.cpp \
-	fdc.cpp \
-	fuserom.cpp \
-	gvram.cpp \
-	human68k.cpp \
-	ioctlr.cpp \
-	keyboard.cpp \
-	lance.cpp \
-	lcd.cpp \
-	lunakbd.cpp \
-	mfp.cpp \
-	mk48t02.cpp \
-	mpu.cpp \
-	mpu680x0.cpp \
-	mpu88xx0.cpp \
-	pio.cpp \
-	pluto.cpp \
-	printer.cpp \
-	prom.cpp \
-	ram.cpp \
-	renderer.cpp \
-	rom.cpp \
-	romemu_luna.cpp \
-	romemu_luna88k.cpp \
-	romimg_x68k.cpp \
-	rp5c15.cpp \
-	rtc.cpp \
-	scc.cpp \
-	scsi.cpp \
-	scsibus.cpp \
-	scsidev.cpp \
-	scheduler.cpp \
-	sio.cpp \
-	spc.cpp \
-	sprite.cpp \
-	sram.cpp \
-	sysclk.cpp \
-	sysctlr.cpp \
-	sysport.cpp \
-	tas.cpp \
-	tvram.cpp \
-	upd7201.cpp \
-	videoctlr.cpp \
-	vm.cpp \
-	vm_luna.cpp \
-	vm_x68k.cpp \
-	x68kkbd.cpp \
-	xiospace.cpp \
-	zram.cpp \
+	adpcm.cpp	\
+	areaset.cpp	\
+	bankram.cpp	\
+	bootloader.cpp	\
+	bt45x.cpp	\
+	cgrom.cpp	\
+	cmmu.cpp	\
+	crtc.cpp	\
+	crtc2.cpp	\
+	device.cpp	\
+	dipsw.cpp	\
+	dmac.cpp	\
+	ethernet.cpp	\
+	event.cpp	\
+	extram.cpp	\
+	fdc.cpp	\
+	fdd.cpp	\
+	fuserom.cpp	\
+	gvram.cpp	\
+	human68k.cpp	\
+	human_mi.cpp	\
+	interrupt.cpp	\
+	iplrom30.cpp	\
+	kbc.cpp	\
+	keyboard.cpp	\
+	lance.cpp	\
+	lcd.cpp	\
+	lunafb.cpp	\
+	lunakbd.cpp	\
+	mainbus.cpp	\
+	mainram.cpp	\
+	mfp.cpp	\
+	mk48t02.cpp	\
+	mpscc.cpp	\
+	mpu.cpp	\
+	mpu64180.cpp	\
+	mpu680x0.cpp	\
+	mpu88xx0.cpp	\
+	msxdos.cpp	\
+	nereid.cpp	\
+	newsctlr.cpp	\
+	newsfb.cpp	\
+	newsio.cpp	\
+	nmi.cpp	\
+	opm.cpp	\
+	partialram.cpp	\
+	pedec.cpp	\
+	pio.cpp	\
+	planevram.cpp	\
+	pluto.cpp	\
+	power.cpp	\
+	printer.cpp	\
+	prom.cpp	\
+	renderer.cpp	\
+	rom.cpp	\
+	romemu_luna.cpp	\
+	romemu_luna1.cpp	\
+	romemu_luna88k.cpp	\
+	romemu_news.cpp	\
+	romemu_x68k.cpp	\
+	romimg_x68k.cpp	\
+	rp5c15.cpp	\
+	rtc.cpp	\
+	rtl8019as.cpp	\
+	scc.cpp	\
+	scheduler.cpp	\
+	scsi.cpp	\
+	scsibus.cpp	\
+	scsicmd.cpp	\
+	scsidev.cpp	\
+	sio.cpp	\
+	spc.cpp	\
+	sprite.cpp	\
+	sram.cpp	\
+	subram.cpp	\
+	syncer.cpp	\
+	sysclk.cpp	\
+	sysctlr.cpp	\
+	sysport.cpp	\
+	tas.cpp	\
+	thread.cpp	\
+	tvram.cpp	\
+	ufs.cpp	\
+	uimessage.cpp	\
+	videoctlr.cpp	\
+	vm.cpp	\
+	vm_luna.cpp	\
+	vm_news.cpp	\
+	vm_x68k.cpp	\
+	x68kio.cpp	\
+	x68kkbd.cpp	\
+	xpbus.cpp	\
 
 CXXSRCS_test=	\
-	test_busio.cpp \
+	test_busio.cpp	\
+	test_tool.cpp	\
 
 CXXSRCS=	${CXXSRCS_vm} ${CXXSRCS_test}