git: 6d41d985fdbf - stable/14 - libsa: Move include file creation to the end of the Makefile

From: Warner Losh <imp_at_FreeBSD.org>
Date: Tue, 16 Apr 2024 20:12:31 UTC
The branch stable/14 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=6d41d985fdbf713adb204840aabfea551d4f8b47

commit 6d41d985fdbf713adb204840aabfea551d4f8b47
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-01-31 23:42:49 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-04-16 19:54:22 +0000

    libsa: Move include file creation to the end of the Makefile
    
    The include file symblic links, etc are out of place where they
    are. Move them to the end of the file. No functional change intended.
    
    Sponsored by:           Netflix
    
    (cherry picked from commit 7c8b126c1a7b30fe690800d7e27b308876711f9d)
---
 stand/libsa/Makefile | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index a1b9bc32e025..f7d7778d5653 100644
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -108,32 +108,6 @@ SRCS+=	${i}
 SRCS+=	lz4.c
 CFLAGS.lz4.c+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4
 
-# Create a subset of includes that are safe, as well as adjusting those that aren't
-# The lists may drive people nuts, but they are explicitly opt-in
-FAKE_DIRS=xlocale arpa
-SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h unistd.h uuid.h
-STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h
-OTHER_INC=stdarg.h errno.h stdint.h
-
-beforedepend:
-	mkdir -p ${FAKE_DIRS}; \
-	for i in ${SAFE_INCS}; do \
-		ln -sf ${SRCTOP}/include/$$i $$i; \
-	done; \
-	ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \
-	ln -sf ${SYSDIR}/sys/errno.h errno.h; \
-	ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \
-	ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \
-	ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \
-	for i in _time.h _strings.h _string.h; do \
-		[ -f xlocale/$$i ] || :> xlocale/$$i; \
-	done; \
-	for i in ${STAND_H_INC}; do \
-		ln -sf ${SASRC}/stand.h $$i; \
-	done
-CLEANDIRS+=${FAKE_DIRS}
-CLEANFILES+= ${SAFE_INCS} ${STAND_H_INC} ${OTHER_INC}
-
 # io routines
 SRCS+=	closeall.c dev.c ioctl.c nullfs.c stat.c mount.c \
 	fstat.c close.c lseek.c open.c read.c write.c readdir.c preload.c
@@ -210,4 +184,30 @@ SRCS+=  explicit_bzero.c crc32_libkern.c
 MAN=libsa.3
 .endif
 
+# Create a subset of includes that are safe, as well as adjusting those that aren't
+# The lists may drive people nuts, but they are explicitly opt-in
+FAKE_DIRS=xlocale arpa
+SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h unistd.h uuid.h
+STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h
+OTHER_INC=stdarg.h errno.h stdint.h
+
+beforedepend:
+	mkdir -p ${FAKE_DIRS}; \
+	for i in ${SAFE_INCS}; do \
+		ln -sf ${SRCTOP}/include/$$i $$i; \
+	done; \
+	ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \
+	ln -sf ${SYSDIR}/sys/errno.h errno.h; \
+	ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \
+	ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \
+	ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \
+	for i in _time.h _strings.h _string.h; do \
+		[ -f xlocale/$$i ] || :> xlocale/$$i; \
+	done; \
+	for i in ${STAND_H_INC}; do \
+		ln -sf ${SASRC}/stand.h $$i; \
+	done
+CLEANDIRS+=${FAKE_DIRS}
+CLEANFILES+= ${SAFE_INCS} ${STAND_H_INC} ${OTHER_INC}
+
 .include <bsd.lib.mk>