From 7750ad47a9a7dbc83f87158464170c8640723293 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar 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 --- share/syscons/fonts/Makefile.depend | 14 ++++++++++++++ share/syscons/keymaps/Makefile.depend | 14 ++++++++++++++ share/syscons/scrnmaps/Makefile.depend | 15 +++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 share/syscons/fonts/Makefile.depend create mode 100644 share/syscons/keymaps/Makefile.depend create mode 100644 share/syscons/scrnmaps/Makefile.depend (limited to 'share/syscons') diff --git a/share/syscons/fonts/Makefile.depend b/share/syscons/fonts/Makefile.depend new file mode 100644 index 000000000000..29fda55c252f --- /dev/null +++ b/share/syscons/fonts/Makefile.depend @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DEP_MACHINE := ${.PARSEFILE:E} + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/share/syscons/keymaps/Makefile.depend b/share/syscons/keymaps/Makefile.depend new file mode 100644 index 000000000000..29fda55c252f --- /dev/null +++ b/share/syscons/keymaps/Makefile.depend @@ -0,0 +1,14 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DEP_MACHINE := ${.PARSEFILE:E} + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend new file mode 100644 index 000000000000..ff699f730be6 --- /dev/null +++ b/share/syscons/scrnmaps/Makefile.depend @@ -0,0 +1,15 @@ +# Autogenerated - do NOT edit! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DEP_MACHINE := ${.PARSEFILE:E} + +DIRDEPS = \ + include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif -- cgit v1.2.3 From f5f7c05209ca2c3748fd8b27c5e80ffad49120eb Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:23:54 +0000 Subject: Updated dependencies --- share/syscons/scrnmaps/Makefile.depend | 2 -- 1 file changed, 2 deletions(-) (limited to 'share/syscons') diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend index ac1b1319c7ef..943a383b89f7 100644 --- a/share/syscons/scrnmaps/Makefile.depend +++ b/share/syscons/scrnmaps/Makefile.depend @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ -- cgit v1.2.3 From 7cf3a1c6b250b3d5403c89c485b8a9ae77d2d89d Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Mon, 11 Mar 2013 17:21:52 +0000 Subject: Updated dependencies --- share/syscons/scrnmaps/Makefile.depend | 1 + 1 file changed, 1 insertion(+) (limited to 'share/syscons') diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend index 943a383b89f7..82222e2879c7 100644 --- a/share/syscons/scrnmaps/Makefile.depend +++ b/share/syscons/scrnmaps/Makefile.depend @@ -7,6 +7,7 @@ DIRDEPS = \ include \ lib/${CSU_DIR} \ lib/libc \ + lib/libcompiler_rt \ .include -- cgit v1.2.3 From 34b33809b72a545cddfc512b09fed786f3e5b685 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:24:00 +0000 Subject: Updated dependencies --- share/syscons/fonts/Makefile.depend | 2 -- share/syscons/keymaps/Makefile.depend | 2 -- 2 files changed, 4 deletions(-) (limited to 'share/syscons') diff --git a/share/syscons/fonts/Makefile.depend b/share/syscons/fonts/Makefile.depend index 29fda55c252f..57b7e10c3d71 100644 --- a/share/syscons/fonts/Makefile.depend +++ b/share/syscons/fonts/Makefile.depend @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ diff --git a/share/syscons/keymaps/Makefile.depend b/share/syscons/keymaps/Makefile.depend index 29fda55c252f..57b7e10c3d71 100644 --- a/share/syscons/keymaps/Makefile.depend +++ b/share/syscons/keymaps/Makefile.depend @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ -- cgit v1.2.3 From c8191bc69e371d47c087ae124ff863de342a479b Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:27:34 +0000 Subject: We do want objdir --- share/syscons/fonts/Makefile | 1 - share/syscons/keymaps/Makefile | 1 - 2 files changed, 2 deletions(-) (limited to 'share/syscons') diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index bb5c6eb4469b..25ff16ad0fcc 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -32,6 +32,5 @@ FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ FILESDIR= ${SHAREDIR}/syscons/fonts -NO_OBJ= .include diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index bcf7dccef93d..295399b93f64 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -52,6 +52,5 @@ FILES= INDEX.keymaps \ FILESDIR= ${SHAREDIR}/syscons/keymaps -NO_OBJ= .include -- cgit v1.2.3 From 76b28ad6ab6dc8d4a62cb7de7f143595be535813 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Sat, 10 May 2014 05:16:28 +0000 Subject: Updated dependencies --- share/syscons/scrnmaps/Makefile.depend | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share/syscons') diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend index 82222e2879c7..e9a1dda6ca51 100644 --- a/share/syscons/scrnmaps/Makefile.depend +++ b/share/syscons/scrnmaps/Makefile.depend @@ -3,10 +3,12 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ + gnu/lib/csu \ gnu/lib/libgcc \ include \ lib/${CSU_DIR} \ lib/libc \ + lib/libc_nonshared \ lib/libcompiler_rt \ -- cgit v1.2.3 From fae50821ae22099d0406090228bc4c5b6af693ad Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Fri, 16 May 2014 14:09:51 +0000 Subject: Updated dependencies --- share/syscons/scrnmaps/Makefile.depend | 1 - 1 file changed, 1 deletion(-) (limited to 'share/syscons') diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend index e9a1dda6ca51..2d9ec507cd13 100644 --- a/share/syscons/scrnmaps/Makefile.depend +++ b/share/syscons/scrnmaps/Makefile.depend @@ -8,7 +8,6 @@ DIRDEPS = \ include \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ -- cgit v1.2.3 From 44d314f704764f0247a540648a4b4fc3e8012133 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Mon, 8 Jun 2015 23:35:17 +0000 Subject: dirdeps.mk now sets DEP_RELDIR --- share/syscons/fonts/Makefile.depend | 2 -- share/syscons/keymaps/Makefile.depend | 2 -- share/syscons/scrnmaps/Makefile.depend | 2 -- 3 files changed, 6 deletions(-) (limited to 'share/syscons') diff --git a/share/syscons/fonts/Makefile.depend b/share/syscons/fonts/Makefile.depend index 57b7e10c3d71..11aba52f82cf 100644 --- a/share/syscons/fonts/Makefile.depend +++ b/share/syscons/fonts/Makefile.depend @@ -1,7 +1,5 @@ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ diff --git a/share/syscons/keymaps/Makefile.depend b/share/syscons/keymaps/Makefile.depend index 57b7e10c3d71..11aba52f82cf 100644 --- a/share/syscons/keymaps/Makefile.depend +++ b/share/syscons/keymaps/Makefile.depend @@ -1,7 +1,5 @@ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend index 2d9ec507cd13..461e7100bbd1 100644 --- a/share/syscons/scrnmaps/Makefile.depend +++ b/share/syscons/scrnmaps/Makefile.depend @@ -1,7 +1,5 @@ # Autogenerated - do NOT edit! -DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} - DIRDEPS = \ gnu/lib/csu \ gnu/lib/libgcc \ -- cgit v1.2.3 From fbeda970cfdf3c3329bc5bb7508080d44ade3ad4 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Wed, 10 Jun 2015 05:39:06 +0000 Subject: remove extra line --- share/syscons/fonts/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'share/syscons') diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index 25ff16ad0fcc..c7c6a1b36dc7 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -32,5 +32,4 @@ FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ FILESDIR= ${SHAREDIR}/syscons/fonts - .include -- cgit v1.2.3 From ee10d8d237f695a137ee24f30407c7eab12a1993 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Wed, 10 Jun 2015 05:39:48 +0000 Subject: Remove extra line --- share/syscons/keymaps/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'share/syscons') diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index 295399b93f64..83ed4ae4d8b5 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -52,5 +52,4 @@ FILES= INDEX.keymaps \ FILESDIR= ${SHAREDIR}/syscons/keymaps - .include -- cgit v1.2.3