diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/ncurses | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
| download | src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.tar.gz src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.zip | |
Merge sync of head
Notes
Notes:
svn path=/projects/bmake/; revision=283595
Diffstat (limited to 'lib/ncurses')
| -rw-r--r-- | lib/ncurses/Makefile | 7 | ||||
| -rw-r--r-- | lib/ncurses/form/Makefile | 3 | ||||
| -rw-r--r-- | lib/ncurses/form/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/ncurses/formw/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/ncurses/menu/Makefile | 3 | ||||
| -rw-r--r-- | lib/ncurses/menu/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/ncurses/menuw/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/ncurses/panel/Makefile | 3 | ||||
| -rw-r--r-- | lib/ncurses/panel/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/ncurses/panelw/Makefile.depend | 1 |
10 files changed, 10 insertions, 12 deletions
diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile index 05cd7a29bb28e..a5a19deafafd4 100644 --- a/lib/ncurses/Makefile +++ b/lib/ncurses/Makefile @@ -3,4 +3,11 @@ SUBDIR= ncurses form menu panel \ ncursesw formw menuw panelw +SUBDIR_PARALLEL= + +.for subdir in ${SUBDIR:Nncurses*:N*w} +SUBDIR_DEPEND_${subdir}= ncurses +SUBDIR_DEPEND_${subdir}w= ncursesw +.endfor + .include <bsd.subdir.mk> diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile index dd903b05c6261..beefb2c4a7d2b 100644 --- a/lib/ncurses/form/Makefile +++ b/lib/ncurses/form/Makefile @@ -54,8 +54,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} CFLAGS+= -I${NCURSES_DIR}/menu -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= form.h diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend index bca73681e3efd..c3295ff8e981c 100644 --- a/lib/ncurses/form/Makefile.depend +++ b/lib/ncurses/form/Makefile.depend @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Makefile.depend index 63cf5597f683e..d56ffbbe742d2 100644 --- a/lib/ncurses/formw/Makefile.depend +++ b/lib/ncurses/formw/Makefile.depend @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile index 3aac081706230..d3890de73e36b 100644 --- a/lib/ncurses/menu/Makefile +++ b/lib/ncurses/menu/Makefile @@ -40,8 +40,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= menu.h eti.h diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend index 01b1fd029b010..5c8368f7d8749 100644 --- a/lib/ncurses/menu/Makefile.depend +++ b/lib/ncurses/menu/Makefile.depend @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Makefile.depend index 1033d6e31f429..49f188286e37e 100644 --- a/lib/ncurses/menuw/Makefile.depend +++ b/lib/ncurses/menuw/Makefile.depend @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile index 7929aed4d0255..b075bcf056afc 100644 --- a/lib/ncurses/panel/Makefile +++ b/lib/ncurses/panel/Makefile @@ -29,8 +29,7 @@ CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= panel.h diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend index 4e0baeb686ce2..2359930f70f61 100644 --- a/lib/ncurses/panel/Makefile.depend +++ b/lib/ncurses/panel/Makefile.depend @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Makefile.depend index fa115192fafd8..2ec647289e615 100644 --- a/lib/ncurses/panelw/Makefile.depend +++ b/lib/ncurses/panelw/Makefile.depend @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ gnu/lib/csu \ gnu/lib/libgcc \ include \ |