From 5443f8e164cf0e95bc68591bff9b9fd73f74078e Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Apr 02 2024 03:14:14 +0000
Subject: project: update to match netbsd/usr.bin/make-20240401.


---

diff --git a/project/common.mk b/project/common.mk
index af510bf..35d4bef 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -4,12 +4,11 @@ API_SRCS = \
 	src/logic/compat.c \
 	src/logic/cond.c \
 	src/logic/dir.c \
-	src/logic/enum.c \
 	src/logic/for.c \
 	src/logic/hash.c \
 	src/logic/job.c \
 	src/logic/lst.c \
-	src/logic/main.c \
+	src/logic/make.c \
 	src/logic/make_malloc.c \
 	src/logic/meta.c \
 	src/logic/metachar.c \
@@ -22,6 +21,6 @@ API_SRCS = \
 	src/logic/var.c \
 
 APP_SRCS = \
-	src/make.c
+	src/main.c
 
 COMMON_SRCS = $(API_SRCS) $(INTERNAL_SRCS)
diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh
index 34bd609..b432ca4 100644
--- a/project/config/cfgdefs.sh
+++ b/project/config/cfgdefs.sh
@@ -34,10 +34,10 @@ cfgdefs_bootstrap()
 
 	cfgdefs_objs=
 
-	cfgdefs_utilsrc='make.c'
+	cfgdefs_utilsrc='main.c'
 
-	cfgdefs_sources="arch.c buf.c compat.c cond.c dir.c enum.c for.c hash.c job.c"
-	cfgdefs_sources="$cfgdefs_sources lst.c main.c make_malloc.c meta.c metachar.c parse.c"
+	cfgdefs_sources="arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c"
+	cfgdefs_sources="$cfgdefs_sources lst.c make.c make_malloc.c meta.c metachar.c parse.c"
 	cfgdefs_sources="$cfgdefs_sources str.c suff.c targ.c trace.c util.c var.c"
 
 	cfgdefs_cflags=
diff --git a/project/headers.mk b/project/headers.mk
index 872f706..fe24bdd 100644
--- a/project/headers.mk
+++ b/project/headers.mk
@@ -2,7 +2,6 @@ INTERNAL_HEADERS = \
 	$(SOURCE_DIR)/src/internal/buf.h \
 	$(SOURCE_DIR)/src/internal/config.h \
 	$(SOURCE_DIR)/src/internal/dir.h \
-	$(SOURCE_DIR)/src/internal/enum.h \
 	$(SOURCE_DIR)/src/internal/hash.h \
 	$(SOURCE_DIR)/src/internal/job.h \
 	$(SOURCE_DIR)/src/internal/lst.h \
@@ -10,7 +9,6 @@ INTERNAL_HEADERS = \
 	$(SOURCE_DIR)/src/internal/make_malloc.h \
 	$(SOURCE_DIR)/src/internal/metachar.h \
 	$(SOURCE_DIR)/src/internal/meta.h \
-	$(SOURCE_DIR)/src/internal/nonints.h \
 	$(SOURCE_DIR)/src/internal/pathnames.h \
 	$(SOURCE_DIR)/src/internal/str.h \
 	$(SOURCE_DIR)/src/internal/trace.h \