--- nono/vm/Makefile	2026/04/29 17:04:31	1.1.1.3
+++ nono/vm/Makefile	2026/04/29 17:04:58	1.1.1.9
@@ -1,21 +1,23 @@
 #
 # nono
-# Copyright (C) 2018 isaki@NetBSD.org
+# Copyright (C) 2020 nono project
+# Licensed under nono-license.txt
+#
+
 #
 # VM
 #
 
-TARGETS=	libnnvm.a test_busio
+.include "../Makefile.inc"
 
-CPPFLAGS+=	-I../m88xx0
-CXXFLAGS+=	-mtune=native
+TARGETS=	libnnvm.a test_busio
 
 CXXSRCS_vm=	\
 	areaset.cpp \
-	bitmap.cpp \
 	bt454.cpp \
 	bus.cpp \
 	cgrom.cpp \
+	cmmu.cpp \
 	crtc.cpp \
 	crtc2.cpp \
 	device.cpp \
@@ -26,31 +28,38 @@ CXXSRCS_vm=	\
 	fuserom.cpp \
 	gvram.cpp \
 	human68k.cpp \
+	human_mi.cpp \
+	interrupt.cpp \
 	keyboard.cpp \
 	lance.cpp \
 	lcd.cpp \
+	lunafb.cpp \
 	lunakbd.cpp \
 	mfp.cpp \
 	mk48t02.cpp \
 	mpu.cpp \
 	mpu680x0.cpp \
 	mpu88xx0.cpp \
-	iocon.cpp \
+	opm.cpp \
+	pedec.cpp \
 	pio.cpp \
 	pluto.cpp \
 	printer.cpp \
+	prom.cpp \
 	ram.cpp \
+	ram_partial.cpp \
 	renderer.cpp \
+	rom.cpp \
 	romemu_luna.cpp \
+	romemu_luna1.cpp \
 	romemu_luna88k.cpp \
-	romimg.cpp \
-	romimg_luna.cpp \
 	romimg_x68k.cpp \
 	rp5c15.cpp \
 	rtc.cpp \
 	scc.cpp \
 	scsi.cpp \
 	scsibus.cpp \
+	scsicmd.cpp \
 	scsidev.cpp \
 	scheduler.cpp \
 	sio.cpp \
@@ -58,10 +67,14 @@ CXXSRCS_vm=	\
 	sprite.cpp \
 	sram.cpp \
 	sysclk.cpp \
+	sysctlr.cpp \
 	sysport.cpp \
+	tas.cpp \
 	tvram.cpp \
+	ufs.cpp \
+	uimessage.cpp \
 	upd7201.cpp \
-	vicon.cpp \
+	videoctlr.cpp \
 	vm.cpp \
 	vm_luna.cpp \
 	vm_x68k.cpp \
@@ -71,6 +84,8 @@ CXXSRCS_vm=	\
 
 CXXSRCS_test=	\
 	test_busio.cpp \
+	test_eventqueue.cpp \
+	test_tool.cpp \
 
 CXXSRCS=	${CXXSRCS_vm} ${CXXSRCS_test}
 
@@ -78,8 +93,6 @@ OBJS_vm=	${CXXSRCS_vm:.cpp=.o}
 
 CLEANFILES+=	gencgrom
 
-.include "../Makefile.inc"
-
 libnnvm.a:	${OBJS_vm}
 	rm -f $@
 	${AR} r $@ $>
@@ -87,3 +100,8 @@ libnnvm.a:	${OBJS_vm}
 
 test_busio:	test_busio.o
 	${CXX} ${LDFLAGS} -o $@ $>
+
+test_eventqueue:	test_eventqueue.o test_tool.o ../lib/libnnlib.a
+	${CXX} ${LDFLAGS} -o $@ $>
+
+.include "../Makefile.rule"