META MODE: Don't create .meta files when symlinking sources into the obj directory.

Tracking these leads to situations where meta mode will consider the
file to be out of date if /bin/sh or /bin/ln are newer than the source
file.  There's no reason for meta mode to do this as make is already
handling the rebuild dependency fine.

Sponsored by:	EMC / Isilon Storage Division

11 files changed, 24 insertions, 25 deletions

diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index baa6faf..d9b0360 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -52,8 +52,8 @@ CXXRT_SRCS+=	libelftc_dem_gnu3.c\
 
 .for _S in ${CXXRT_SRCS}
 STATICOBJS+=	cxxrt_${_S:R}.o
-cxxrt_${_S}:
-	ln -sf ${LIBCXXRTDIR}/${_S} ${.TARGET}
+cxxrt_${_S}: ${LIBCXXRTDIR}/${_S} .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
 WARNS=		0
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index c46f898..e25f516 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -15,6 +15,6 @@ CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/gdtoa
 .for src in ${GDTOASRCS}
 MISRCS+=gdtoa_${src}
 CLEANFILES+=gdtoa_${src}
-gdtoa_${src}:
-	ln -sf ${LIBC_SRCTOP}/../../contrib/gdtoa/${src} ${.TARGET}
+gdtoa_${src}: ${LIBC_SRCTOP}/../../contrib/gdtoa/${src} .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 2232b79..b448461 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -159,8 +159,8 @@ CANCELPOINTS_SRCS=sem.c sem_new.c
 .for src in ${CANCELPOINTS_SRCS}
 SRCS+=cancelpoints_${src}
 CLEANFILES+=cancelpoints_${src}
-cancelpoints_${src}:
-	ln -sf ${LIBC_SRCTOP}/gen/${src} ${.TARGET}
+cancelpoints_${src}: ${LIBC_SRCTOP}/gen/${src} .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
 SYM_MAPS+=${LIBC_SRCTOP}/gen/Symbol.map
diff --git a/lib/libc/stdlib/jemalloc/Makefile.inc b/lib/libc/stdlib/jemalloc/Makefile.inc
index 46006ee..a04ccf2 100644
--- a/lib/libc/stdlib/jemalloc/Makefile.inc
+++ b/lib/libc/stdlib/jemalloc/Makefile.inc
@@ -14,14 +14,14 @@ CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/jemalloc/include
 .for src in ${JEMALLOCSRCS}
 MISRCS+=jemalloc_${src}
 CLEANFILES+=jemalloc_${src}
-jemalloc_${src}:
-	ln -sf ${LIBC_SRCTOP}/../../contrib/jemalloc/src/${src} ${.TARGET}
+jemalloc_${src}: ${LIBC_SRCTOP}/../../contrib/jemalloc/src/${src} .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
 MAN+=jemalloc.3
 CLEANFILES+=jemalloc.3
-jemalloc.3:
-	ln -sf ${LIBC_SRCTOP}/../../contrib/jemalloc/doc/jemalloc.3 ${.TARGET}
+jemalloc.3: ${LIBC_SRCTOP}/../../contrib/jemalloc/doc/jemalloc.3
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 MLINKS+= \
 	jemalloc.3 malloc.3 \
diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
index 590aab3..30e0c60 100644
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@@ -93,9 +93,9 @@ CLEANFILES=	${GENSRCS}
 CLEANDIRS=	sys
 CFLAGS+=	-I. -I${SRCDIR} -I${TOP}/common -I${TOP}/libelf
 
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET}
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA
 	mkdir -p ${.OBJDIR}/sys
-	ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET}
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 LIBADD+=	elf
 
diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index c400204..91dbea6f1 100644
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@@ -78,9 +78,9 @@ CLEANFILES=	${GENSRCS}
 CLEANDIRS=	sys
 CFLAGS+=	-I. -I${SRCDIR} -I${TOP}/common
 
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET}
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA
 	mkdir -p ${.OBJDIR}/sys
-	ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET}
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 SHLIB_MAJOR=	2
 
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index ca9838d..81172ec 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -29,7 +29,7 @@ CLEANFILES+=sm_os.h
 
 WARNS?=	0
 
-sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index c36b3ef..cdc0228 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -126,9 +126,8 @@ version.h: ${PCAP_DISTDIR}/VERSION
 	@rm -f $@
 	sed 's/.*/char pcap_version_string[] = "libpcap version &";/' ${PCAP_DISTDIR}/VERSION > $@
 
-tokdefs.h: grammar.h
-	ln -sf grammar.h tokdefs.h
-
+tokdefs.h: grammar.h .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 #
 # Magic to convert the man pages to something non Solarish
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 20f54c1..1ec2dc1 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -36,7 +36,7 @@ CLEANFILES+=sm_os.h
 
 INTERNALLIB=
 
-sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile
index 976282c..f1f5199 100644
--- a/lib/libsmdb/Makefile
+++ b/lib/libsmdb/Makefile
@@ -19,7 +19,7 @@ CLEANFILES+=sm_os.h
 
 INTERNALLIB=
 
-sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile
index b7e5a69..e7919ea 100644
--- a/lib/libsmutil/Makefile
+++ b/lib/libsmutil/Makefile
@@ -19,7 +19,7 @@ CLEANFILES+=sm_os.h
 
 INTERNALLIB=
 
-sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>