kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bsdinstall generate opt_osname.h in include

Browse source 
This allows the subdirs that do more work to run in parallel

Reviewed by:	jrtc27
Differential Revision:	https://reviews.freebsd.org/D42947
This commit is contained in:
Simon J. Gerraty 2023-12-06 18:34:52 -08:00
parent 3933ff56f9
commit 83d0b8c089
11 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr.sbin/bsdinstall/Makefile
View file

@ -1,9 +1,9 @@
OSNAME?= FreeBSD
SUBDIR= distextract distfetch partedit runconsoles scripts
SUBDIR_PARALLEL=
SUBDIR_DEPEND_distfetch = distextract
SUBDIR_DEPEND_partedit = distextract
SUBDIR_DEPEND_distextract = include
SUBDIR_DEPEND_distfetch = include
SUBDIR_DEPEND_partedit = include
SCRIPTS= bsdinstall
MAN= bsdinstall.8
PACKAGE= bsdinstall
@ -11,5 +11,6 @@ PACKAGE= bsdinstall
SCRIPTS+= startbsdinstall
SCRIPTSDIR_startbsdinstall= ${LIBEXECDIR}/bsdinstall
UPDATE_DEPENDFILE= no
.include <bsd.prog.mk>

12
usr.sbin/bsdinstall/Makefile.depend
View file

@ -1,10 +1,12 @@
# Autogenerated - do NOT edit!
# Not autogenerated - take care
DIRDEPS = \
usr.sbin/bsdinstall/distextract \
usr.sbin/bsdinstall/distfetch \
usr.sbin/bsdinstall/include \
usr.sbin/bsdinstall/partedit \
usr.sbin/bsdinstall/runconsoles \
usr.sbin/bsdinstall/scripts \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif

3
usr.sbin/bsdinstall/Makefile.inc
View file

@ -1 +1,4 @@
PACKAGE=bsdinstall
CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../include

9
usr.sbin/bsdinstall/distextract/Makefile
View file

@ -1,18 +1,9 @@
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distextract
CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I.
LIBADD= archive bsddialog m
SRCS= distextract.c
MAN=
GENHDRS= opt_osname.h
SRCS+= ${GENHDRS}
CLEANFILES+= ${GENHDRS}
opt_osname.h: .PHONY
if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \
echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \
fi
.include <bsd.prog.mk>

1
usr.sbin/bsdinstall/distextract/Makefile.depend
View file

@ -9,6 +9,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
usr.sbin/bsdinstall/include \
.include <dirdeps.mk>

1
usr.sbin/bsdinstall/distfetch/Makefile
View file

@ -1,7 +1,6 @@
BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distfetch
CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract
LIBADD= fetch bsddialog
MAN=

2
usr.sbin/bsdinstall/distfetch/Makefile.depend
View file

@ -8,7 +8,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libfetch \
usr.sbin/bsdinstall/distextract \
usr.sbin/bsdinstall/include \
.include <dirdeps.mk>

13
usr.sbin/bsdinstall/include/Makefile Normal file
View file

@ -0,0 +1,13 @@
OSNAME?= FreeBSD
GENHDRS= opt_osname.h
SRCS+= ${GENHDRS}
CLEANFILES+= ${GENHDRS}
opt_osname.h: ${META_NOPHONY}
@if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET} 2> /dev/null; then \
echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \
fi
MK_STAGING= no
.include <bsd.prog.mk>

10
usr.sbin/bsdinstall/include/Makefile.depend Normal file
View file

@ -0,0 +1,10 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif

1
usr.sbin/bsdinstall/partedit/Makefile
View file

@ -4,7 +4,6 @@ PROG= partedit
LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
${BINDIR}/partedit ${BINDIR}/scriptedpart
SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade
CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract
LIBADD+= geom util bsddialog
PARTEDIT_ARCH= ${MACHINE}

2
usr.sbin/bsdinstall/partedit/Makefile.depend
View file

@ -9,7 +9,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgeom \
lib/libutil \
usr.sbin/bsdinstall/distextract \
usr.sbin/bsdinstall/include \
.include <dirdeps.mk>