From 9dd41e3647df728006e0749ac139cfeb773c3873 Mon Sep 17 00:00:00 2001 From: marcel Date: Wed, 22 Aug 2012 19:25:57 +0000 Subject: Sync FreeBSD's bmake branch with Juniper's internal bmake branch. Requested by: Simon Gerraty --- usr.bin/grep/Makefile.depend | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 usr.bin/grep/Makefile.depend (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend new file mode 100644 index 0000000..9c35699 --- /dev/null +++ b/usr.bin/grep/Makefile.depend @@ -0,0 +1,23 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DEP_MACHINE := ${.PARSEFILE:E} + +DIRDEPS = \ + gnu/lib/libgcc \ + gnu/lib/libregex \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libbz2 \ + lib/libc \ + lib/liblzma \ + lib/libz \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif -- cgit v1.1 From 0ee5295509f95c5780976697a2d3539b994458ca Mon Sep 17 00:00:00 2001 From: sjg Date: Sat, 16 Feb 2013 01:23:54 +0000 Subject: Updated dependencies --- usr.bin/grep/Makefile.depend | 2 -- 1 file changed, 2 deletions(-) (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend index 9c35699..e85683d 100644 --- a/usr.bin/grep/Makefile.depend +++ b/usr.bin/grep/Makefile.depend @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ gnu/lib/libregex \ -- cgit v1.1 From 6d37b86f2b6abb5c0c11a9162e37ddc0ad94f01d Mon Sep 17 00:00:00 2001 From: sjg Date: Mon, 11 Mar 2013 17:21:52 +0000 Subject: Updated dependencies --- usr.bin/grep/Makefile.depend | 1 + 1 file changed, 1 insertion(+) (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend index e85683d..75c9e12 100644 --- a/usr.bin/grep/Makefile.depend +++ b/usr.bin/grep/Makefile.depend @@ -10,6 +10,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libbz2 \ lib/libc \ + lib/libcompiler_rt \ lib/liblzma \ lib/libz \ -- cgit v1.1 From 1a7e48acf1acf8cb3ef3ba6787cc57e18faa8479 Mon Sep 17 00:00:00 2001 From: sjg Date: Sat, 10 May 2014 05:16:28 +0000 Subject: Updated dependencies --- usr.bin/grep/Makefile.depend | 2 ++ 1 file changed, 2 insertions(+) (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend index 75c9e12..e06aa1d 100644 --- a/usr.bin/grep/Makefile.depend +++ b/usr.bin/grep/Makefile.depend @@ -3,6 +3,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + gnu/lib/csu \ gnu/lib/libgcc \ gnu/lib/libregex \ include \ @@ -10,6 +11,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libbz2 \ lib/libc \ + lib/libc_nonshared \ lib/libcompiler_rt \ lib/liblzma \ lib/libz \ -- cgit v1.1 From 5860f0d10657dc9748acf6637885ee7fbf6fb212 Mon Sep 17 00:00:00 2001 From: sjg Date: Fri, 16 May 2014 14:09:51 +0000 Subject: Updated dependencies --- usr.bin/grep/Makefile.depend | 1 - 1 file changed, 1 deletion(-) (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend index e06aa1d..b8b81d7 100644 --- a/usr.bin/grep/Makefile.depend +++ b/usr.bin/grep/Makefile.depend @@ -11,7 +11,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libbz2 \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/liblzma \ lib/libz \ -- cgit v1.1 From 75a137820de70f75cd932fd2fa365fabaf06fa90 Mon Sep 17 00:00:00 2001 From: sjg Date: Mon, 8 Jun 2015 23:35:17 +0000 Subject: dirdeps.mk now sets DEP_RELDIR --- usr.bin/grep/Makefile.depend | 2 -- 1 file changed, 2 deletions(-) (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend index e170be2..7ccf682 100644 --- a/usr.bin/grep/Makefile.depend +++ b/usr.bin/grep/Makefile.depend @@ -1,7 +1,5 @@ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ bin/cat.host \ gnu/lib/csu \ -- cgit v1.1 From 7d17ddfb84feceee615e0bf43b832afd183bde0a Mon Sep 17 00:00:00 2001 From: sjg Date: Mon, 8 Jun 2015 23:37:17 +0000 Subject: Avoid bogus MLINKS when MK_LZMA_SUPPORT=yes and MK_BSD_GREP=no --- usr.bin/grep/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'usr.bin/grep') diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 38df85a..af21471 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -39,6 +39,7 @@ LIBADD= z .if ${MK_LZMA_SUPPORT} != "no" LIBADD+= lzma +.if ${MK_BSD_GREP} == "yes" LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \ ${BINDIR}/${PROG} ${BINDIR}/xzegrep \ ${BINDIR}/${PROG} ${BINDIR}/xzfgrep \ @@ -52,6 +53,7 @@ MLINKS+= grep.1 xzgrep.1 \ grep.1 lzgrep.1 \ grep.1 lzegrep.1 \ grep.1 lzfgrep.1 +.endif .else CFLAGS+= -DWITHOUT_LZMA .endif -- cgit v1.1