Remove unnecessary _SUBDIRUSE

This was already being added in subdir.mk Also, remove SUBDIR from realbuild. If we want to build a subdir, we can use DPADD.
VexedUXR · Apr 28, 2024 · 99be9c5 · 99be9c5
1 parent e24279b
commit 99be9c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
 PROG=	bmake
 
 SUBDIR+=	tre
+DPADD+=		tre
 LDADD+=		user32.lib tre.lib
 LDFLAGS+=	/libpath:tre
 

diff --git a/mk/lib.mk b/mk/lib.mk
@@ -65,7 +65,7 @@ _LIBS=
 .endif
 
 .if !defined(_SKIP_BUILD)
-realbuild: ${SUBDIR} ${_LIBS}
+realbuild: ${_LIBS}
 .endif
 
 OBJS_SRCS = ${SRCS:${OBJS_SRCS_FILTER}}
@@ -103,10 +103,10 @@ cleanlib: .PHONY
 	${RM} ${SHLIB_LINKS}
 .endif
 
-clean:  _SUBDIRUSE cleanlib
-cleandir: _SUBDIRUSE cleanlib
+clean: cleanlib
+cleandir: cleanlib
 .else
-cleandir: _SUBDIRUSE clean
+cleandir: clean
 .endif
 .include <subdir.mk>
 .endif
diff --git a/mk/prog.mk b/mk/prog.mk
@@ -64,17 +64,17 @@ ${PROG}.exe: ${OBJS} ${DPADD}
 .endif	# defined(PROG)
 
 .if !defined(_SKIP_BUILD)
-realbuild: ${SUBDIR} ${PROG}.exe
+realbuild: ${PROG}.exe
 .endif
 
 .if !target(clean)
 cleanprog:
 	${RM} ${PROG}.exe ${OBJS} ${CLEANFILES}
 
-clean: _SUBDIRUSE cleanprog
-cleandir: _SUBDIRUSE cleanprog
+clean: cleanprog
+cleandir: cleanprog
 .else
-cleandir: _SUBDIRUSE clean
+cleandir: clean
 .endif
 .include <subdir.mk>
 .endif