--- nono/m680x0/Makefile	2026/04/29 17:04:31	1.1.1.2
+++ nono/m680x0/Makefile	2026/04/29 17:05:40	1.1.1.10
@@ -1,44 +1,54 @@
 #
 # nono
-# Copyright (C) 2017 isaki@NetBSD.org
+# Copyright (C) 2020 nono project
+# Licensed under nono-license.txt
+#
+
 #
 # m680x0 コア
 #
 
-TARGETS=	libnnm680x0.a testacc testea testdis
-
-CXXFLAGS+=	-mtune=native
+.include "../Makefile.inc"
 
-CXXSRCS_lib=	\
-	m68030acc.cpp	\
-	m68030core.cpp	\
-	m68030disasm.cpp	\
-	m68030ea.cpp	\
-	m68030fpu.cpp	\
+TARGETS=	libnnm680x0.a
+.if !defined(RELEASE)
+TARGETS+=	testacc testea testdis
+.endif
+
+CXXSRCS=	\
+	m680x0acc.cpp	\
+	m680x0bitfield.cpp	\
+	m680x0core.cpp	\
+	m680x0disasm.cpp	\
+	m680x0ea.cpp	\
+	m680x0fpu.cpp	\
+	m680x0ops.cpp	\
+	m68030bus.cpp	\
 	m68030mmu.cpp	\
-	m68030subr.cpp	\
+	m68040bus.cpp	\
+	m68040mmu.cpp	\
 
 CXXSRCS_test=	\
 	testacc.cpp	\
 	testdis.cpp	\
 	testea.cpp	\
 
-CXXSRCS=	${CXXSRCS_lib} ${CXXSRCS_test}
+CXXSRCS_all=	${CXXSRCS} ${CXXSRCS_test}
 
-OBJS_lib=	${CXXSRCS_lib:.cpp=.o}
+OBJS=	${CXXSRCS:.cpp=.o}
 
-.include "../Makefile.inc"
-
-libnnm680x0.a:	${OBJS_lib}
+libnnm680x0.a:	${OBJS}
 	rm -f $@
 	${AR} r $@ $>
 	${RANLIB} $@
 
-testacc:	testacc.o
+testacc:	testacc.o m680x0acc.o
 	${CXX} ${LDFLAGS} -o $@ $> ${LIBS}
 
-testea:		testea.o
+testea:		testea.o m680x0ea.o
 	${CXX} ${LDFLAGS} -o $@ $> ${LIBS}
 
-testdis:	testdis.o m68030disasm.o ../lib/mystring.o
+testdis:	testdis.o m680x0disasm.o ../lib/mystring.o
 	${CXX} ${LDFLAGS} -o $@ $> ${LIBS}
+
+.include "../Makefile.rule"