--- nono/vm/Makefile	2026/04/29 17:04:29	1.1.1.2
+++ nono/vm/Makefile	2026/04/29 17:04:52	1.1.1.7
@@ -1,21 +1,24 @@
 #
 # nono
-# Copyright (C) 2018 isaki@NetBSD.org
+# Copyright (C) 2020 nono project
+# Licensed under nono-license.txt
+#
+
 #
 # VM
 #
 
-TARGETS=	libnnvm.a
+.include "../Makefile.inc"
 
-CPPFLAGS+=	-I. -I.. -I../fpe -I../lib -I../m680x0 -I../debugger -I../host
-CXXFLAGS+=	-mtune=native
+TARGETS=	libnnvm.a test_busio
 
-CXXSRCS=	\
+CXXSRCS_vm=	\
 	areaset.cpp \
 	bitmap.cpp \
 	bt454.cpp \
 	bus.cpp \
 	cgrom.cpp \
+	cmmu.cpp \
 	crtc.cpp \
 	crtc2.cpp \
 	device.cpp \
@@ -23,23 +26,33 @@ CXXSRCS=	\
 	ethernet.cpp \
 	event.cpp \
 	fdc.cpp \
+	fuserom.cpp \
 	gvram.cpp \
 	human68k.cpp \
+	interrupt.cpp \
 	keyboard.cpp \
 	lance.cpp \
 	lcd.cpp \
 	lunakbd.cpp \
-	lunarom.cpp \
 	mfp.cpp \
 	mk48t02.cpp \
 	mpu.cpp \
-	iocon.cpp \
+	mpu680x0.cpp \
+	mpu88xx0.cpp \
+	opm.cpp \
+	pedec.cpp \
+	pio.cpp \
 	pluto.cpp \
-	ppi.cpp \
 	printer.cpp \
+	prom.cpp \
 	ram.cpp \
+	ram_partial.cpp \
 	renderer.cpp \
 	rom.cpp \
+	romemu_luna.cpp \
+	romemu_luna1.cpp \
+	romemu_luna88k.cpp \
+	romimg_x68k.cpp \
 	rp5c15.cpp \
 	rtc.cpp \
 	scc.cpp \
@@ -52,23 +65,40 @@ CXXSRCS=	\
 	sprite.cpp \
 	sram.cpp \
 	sysclk.cpp \
+	sysctlr.cpp \
 	sysport.cpp \
+	tas.cpp \
 	tvram.cpp \
+	ufs.cpp \
 	upd7201.cpp \
-	vicon.cpp \
+	videoctlr.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 \
+	test_eventqueue.cpp \
+	test_tool.cpp \
 
-CLEANFILES+=	gencgrom
+CXXSRCS=	${CXXSRCS_vm} ${CXXSRCS_test}
 
-.include "../Makefile.inc"
+OBJS_vm=	${CXXSRCS_vm:.cpp=.o}
 
-libnnvm.a:	${OBJS}
+CLEANFILES+=	gencgrom
+
+libnnvm.a:	${OBJS_vm}
 	rm -f $@
 	${AR} r $@ $>
 	${RANLIB} $@
+
+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"