diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-06-15 17:08:13 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-06-15 17:08:13 +0000 |
| commit | c63c5ab001106bc7beb1d3bc92666c73bcd5c94d (patch) | |
| tree | 836cec754359f16f3c140c1e309c0212ee25ccba | |
| parent | f39f6a562e8e6717c1e1355bbd7d9b2566d7cc9a (diff) | |
| download | src-c63c5ab001106bc7beb1d3bc92666c73bcd5c94d.tar.gz src-c63c5ab001106bc7beb1d3bc92666c73bcd5c94d.zip | |
Fix .depend files to work for build tools.
This is somewhat of a follow-up to r335746.
MFC after: 2 weeks
Sponsored by: DellEMC
Notes
Notes:
svn path=/head/; revision=349062
| -rw-r--r-- | bin/csh/Makefile | 1 | ||||
| -rw-r--r-- | bin/sh/Makefile | 1 | ||||
| -rw-r--r-- | lib/libmagic/Makefile | 5 | ||||
| -rw-r--r-- | lib/ncurses/ncurses/Makefile | 1 | ||||
| -rw-r--r-- | share/syscons/scrnmaps/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/awk/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/vi/catalog/Makefile | 4 |
7 files changed, 10 insertions, 4 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index b0d4435d970c..9aabc047493a 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -117,6 +117,7 @@ csh.1: tcsh.man build-tools: gethost +DEPENDOBJS+= gethost gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META} @rm -f ${.TARGET} ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ diff --git a/bin/sh/Makefile b/bin/sh/Makefile index ee4fa87026cf..7787194fa686 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -48,6 +48,7 @@ builtins.h: .NOMETA builtins.c builtins.h: mkbuiltins builtins.def sh ${.CURDIR}/mkbuiltins ${.CURDIR} +DEPENDOBJS+= mknodes mksyntax mknodes mksyntax: ${BUILD_TOOLS_META} .ORDER: nodes.c nodes.h diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 7febf1c2297c..a3036d7f3f58 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -41,10 +41,11 @@ magic.mgc: mkmagic magic ${BTOOLSPATH:U.}/mkmagic magic CLEANFILES+= mkmagic +DEPENDOBJS+= mkmagic build-tools: mkmagic mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META} - ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \ - ${LDADD} + ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ + ${.ALLSRC:N*.h:O:u} ${LDADD} FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 8e6adfcc1fb2..196bbc453df4 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -389,6 +389,7 @@ keys.list: MKkeys_list.sh Caps ${NCURSES_DIR}/include/Caps | LC_ALL=C sort > keys.list # Build tools +DEPENDOBJS+= make_hash make_keys build-tools: make_hash make_keys make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index c8d3db54dcb3..0f11c777fa02 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -12,6 +12,7 @@ CLEANFILES+= ${SCRMAPS_MK} ${SCRMAPS} FILES= ${SCRMAPS} FILESDIR= ${SHAREDIR}/syscons/scrnmaps +DEPENDOBJS+= ${SCRMAPS_MK} build-tools: ${SCRMAPS_MK} ${SCRMAPS}: ${.TARGET:R}.mk diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index 4ea401b99cd7..eb69a29fd862 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -27,6 +27,7 @@ ytab.h: awkgram.c awkgram.h .NOMETA proctab.c: maketab ${BTOOLSPATH:U.}/maketab awkgram.h > proctab.c +DEPENDOBJS+= maketab build-tools: maketab maketab: ytab.h maketab.c ${BUILD_TOOLS_META} diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile index a8977dd809f6..6e2ed340f31e 100644 --- a/usr.bin/vi/catalog/Makefile +++ b/usr.bin/vi/catalog/Makefile @@ -105,8 +105,8 @@ english.base: dump ${SCAN} #Makefile sort -nu > $@ -dump: dump.c ${BUILD_TOOLS_META} - ${CC:N${CCACHE_BIN}} -o ${.TARGET} ${.ALLSRC} +DEPENDOBJS+= dump +dump: ${BUILD_TOOLS_META} CLEANFILES+= dump ${CAT} english.base *.check __ck1 __ck2 |