--- nono/lib/Makefile	2026/04/29 17:05:26	1.1.1.8
+++ nono/lib/Makefile	2026/04/29 17:05:47	1.1.1.11
@@ -12,13 +12,14 @@
 
 TARGETS=	libnnlib.a
 
-CXXSRCS_lib=	\
+CXXSRCS=	\
 	bitmap.cpp	\
 	bitops.cpp	\
+	classname.cpp	\
 	config.cpp	\
+	exttostr.cpp	\
 	object.cpp	\
 	object_id.cpp	\
-	logger.cpp	\
 	macaddr.cpp	\
 	mainapp.cpp	\
 	mappedfile.cpp	\
@@ -30,23 +31,26 @@ CXXSRCS_lib=	\
 	textscreen.cpp	\
 
 .if "${HOST_HAS_AVX2}" == "yes"
-CXXSRCS_lib+=	bitmap_avx2.cpp
+CXXSRCS+=	bitmap_avx2.cpp
 CXXFLAGS.bitmap_avx2.cpp+=	-mavx2
 .endif
 
 CXXSRCS_test=	\
 	test_mystring.cpp	\
 
-CXXSRCS=	${CXXSRCS_lib} ${CXXSRCS_test}
+CXXSRCS_all=	${CXXSRCS} ${CXXSRCS_test}
 
-OBJS_lib=	${CXXSRCS_lib:.cpp=.o}
+OBJS=	${CXXSRCS:.cpp=.o}
 
-libnnlib.a:	${OBJS_lib}
+libnnlib.a:	${OBJS}
 	rm -f $@
 	${AR} r $@ $>
 	${RANLIB} $@
 
 test_mystring: test_mystring.o libnnlib.a
-	${CXX} ${LDFLAGS} -o $@ $> ${LIBS} libnnlib.a
+	${CXX} ${LDFLAGS} -o $@ $> ${LIBS}
+
+test_exttostr:	exttostr.cpp mystring.o
+	${CXX} ${LDFLAGS} -I.. -DTEST -o $@ $>
 
 .include "../Makefile.rule"