From 7baa8be95c8fc1d0176d6fa179896cf605aa16e9 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Mon, 2 Oct 2017 16:29:44 +0300 Subject: [PATCH] ncurses: move headers to /usr/include 'ncurses-config --includedir' is now correct. also, don't reach into objdir/proto but just use LDADD=-lncurses in programs -- we need a tree-wide solution for linking against freshly built objects, not one that has to be explicitly added everywhere. --- bin/clear/Makefile | 3 +-- bin/infocmp/Makefile | 3 +-- bin/tabs/Makefile | 3 +-- bin/tic/Makefile | 3 +-- bin/toe/Makefile | 3 +-- bin/tput/Makefile | 3 +-- bin/tset/Makefile | 3 +-- contrib/ncurses/form/form.pc | 3 +-- contrib/ncurses/menu/menu.pc | 3 +-- contrib/ncurses/ncurses/ncurses.pc | 3 +-- contrib/ncurses/panel/panel.pc | 3 +-- lib/libncurses/form/Makefile | 6 +++--- lib/libncurses/menu/Makefile | 6 +++--- lib/libncurses/ncurses/Makefile | 8 ++++---- lib/libncurses/panel/Makefile | 6 +++--- usr/src/cmd/cmd-inet/usr.bin/Makefile | 3 +-- usr/src/cmd/cmd-inet/usr.bin/talk/Makefile | 1 - usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile | 1 - usr/src/cmd/ipf/tools/Makefile.tools | 2 +- usr/src/cmd/latencytop/Makefile.com | 3 +-- usr/src/cmd/ls/Makefile | 2 -- usr/src/cmd/ls/Makefile.com | 1 - usr/src/cmd/mdb/Makefile.mdb | 1 - usr/src/cmd/mdb/intel/amd64/kmdb/Makefile | 1 - usr/src/cmd/more/Makefile | 1 - usr/src/cmd/pg/Makefile | 1 - usr/src/cmd/powertop/Makefile.com | 1 - usr/src/cmd/prstat/Makefile | 1 - usr/src/cmd/prstat/Makefile.com | 1 - usr/src/cmd/ul/Makefile | 1 - usr/src/lib/libtecla/Makefile.com | 1 - usr/src/pkg/manifests/library-ncurses.mf | 21 ++++++++++----------- 32 files changed, 37 insertions(+), 65 deletions(-) diff --git a/bin/clear/Makefile b/bin/clear/Makefile index 9cbcadd227..e383622af6 100644 --- a/bin/clear/Makefile +++ b/bin/clear/Makefile @@ -12,12 +12,11 @@ CFLAGS+= -DSET_NCURSES_CH_T=cchar_t CFLAGS+= -DSET_NEED_WCHAR_H=1 CFLAGS+= -I${PROGSDIR} CFLAGS+= -I. -CFLAGS+= -I${SRCTOP}/proto/root_i386/usr/include/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.OBJDIR} -LDADD= -L${MAKEOBJDIRPREFIX}${SRCTOP}/lib/libncurses/ncurses -lncurses +LDADD= -lncurses # TODO: build libncurses first libs: diff --git a/bin/infocmp/Makefile b/bin/infocmp/Makefile index ce13011b65..9ce9073396 100644 --- a/bin/infocmp/Makefile +++ b/bin/infocmp/Makefile @@ -13,12 +13,11 @@ CFLAGS+= -DSET_NCURSES_CH_T=cchar_t CFLAGS+= -DSET_NEED_WCHAR_H=1 CFLAGS+= -I${PROGSDIR} CFLAGS+= -I. -CFLAGS+= -I${SRCTOP}/proto/root_i386/usr/include/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.OBJDIR} -LDADD= -L${MAKEOBJDIRPREFIX}${SRCTOP}/lib/libncurses/ncurses -lncurses +LDADD= -lncurses _termsortc= termsort.c beforedepend: termsort.c diff --git a/bin/tabs/Makefile b/bin/tabs/Makefile index 324fee89b2..7d5e944085 100644 --- a/bin/tabs/Makefile +++ b/bin/tabs/Makefile @@ -12,12 +12,11 @@ CFLAGS+= -DSET_NCURSES_CH_T=cchar_t CFLAGS+= -DSET_NEED_WCHAR_H=1 CFLAGS+= -I${PROGSDIR} CFLAGS+= -I. -CFLAGS+= -I${SRCTOP}/proto/root_i386/usr/include/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.OBJDIR} -LDADD= -L${MAKEOBJDIRPREFIX}${SRCTOP}/lib/libncurses/ncurses -lncurses +LDADD= -lncurses tabs.o: ${PROGSDIR}/tabs.c ${CC} ${CFLAGS} -c ${PROGSDIR}/tabs.c -o $@ diff --git a/bin/tic/Makefile b/bin/tic/Makefile index 2ee060eeb9..1147ff37b0 100644 --- a/bin/tic/Makefile +++ b/bin/tic/Makefile @@ -13,12 +13,11 @@ CFLAGS+= -DSET_NCURSES_CH_T=cchar_t CFLAGS+= -DSET_NEED_WCHAR_H=1 CFLAGS+= -I${PROGSDIR} CFLAGS+= -I. -CFLAGS+= -I${SRCTOP}/proto/root_i386/usr/include/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.OBJDIR} -LDADD= -L${MAKEOBJDIRPREFIX}${SRCTOP}/lib/libncurses/ncurses -lncurses +LDADD= -lncurses ncurses_def.h: AWK=awk sh ${NCURSES_DIR}/include/MKncurses_def.sh \ diff --git a/bin/toe/Makefile b/bin/toe/Makefile index b2b334b528..fd6bdc6b39 100644 --- a/bin/toe/Makefile +++ b/bin/toe/Makefile @@ -12,12 +12,11 @@ CFLAGS+= -DSET_NCURSES_CH_T=cchar_t CFLAGS+= -DSET_NEED_WCHAR_H=1 CFLAGS+= -I${PROGSDIR} CFLAGS+= -I. -CFLAGS+= -I${SRCTOP}/proto/root_i386/usr/include/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.OBJDIR} -LDADD= -L${MAKEOBJDIRPREFIX}${SRCTOP}/lib/libncurses/ncurses -lncurses +LDADD= -lncurses toe.o: ${PROGSDIR}/toe.c ${CC} ${CFLAGS} -c ${PROGSDIR}/toe.c -o $@ diff --git a/bin/tput/Makefile b/bin/tput/Makefile index 5ecd96d634..e4375ff0cc 100644 --- a/bin/tput/Makefile +++ b/bin/tput/Makefile @@ -12,12 +12,11 @@ CFLAGS+= -DSET_NCURSES_CH_T=cchar_t CFLAGS+= -DSET_NEED_WCHAR_H=1 CFLAGS+= -I${PROGSDIR} CFLAGS+= -I. -CFLAGS+= -I${SRCTOP}/proto/root_i386/usr/include/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.OBJDIR} -LDADD= -L${MAKEOBJDIRPREFIX}${SRCTOP}/lib/libncurses/ncurses -lncurses +LDADD= -lncurses tput.o: ${PROGSDIR}/tput.c ${CC} ${CFLAGS} -c ${PROGSDIR}/tput.c -o $@ diff --git a/bin/tset/Makefile b/bin/tset/Makefile index 0ad006d18d..a50fe40497 100644 --- a/bin/tset/Makefile +++ b/bin/tset/Makefile @@ -12,12 +12,11 @@ CFLAGS+= -DSET_NCURSES_CH_T=cchar_t CFLAGS+= -DSET_NEED_WCHAR_H=1 CFLAGS+= -I${PROGSDIR} CFLAGS+= -I. -CFLAGS+= -I${SRCTOP}/proto/root_i386/usr/include/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.OBJDIR} -LDADD= -L${MAKEOBJDIRPREFIX}${SRCTOP}/lib/libncurses/ncurses -lncurses +LDADD= -lncurses tset.o: ${PROGSDIR}/tset.c ${CC} ${CFLAGS} -c ${PROGSDIR}/tset.c -o $@ diff --git a/contrib/ncurses/form/form.pc b/contrib/ncurses/form/form.pc index 6843ccf4d2..ba4a626885 100644 --- a/contrib/ncurses/form/form.pc +++ b/contrib/ncurses/form/form.pc @@ -4,7 +4,6 @@ prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include/ncurses abi_version=6 major_version=6 version=6.0.20170916 @@ -16,4 +15,4 @@ URL: http://invisible-island.net/ncurses Requires.private: ncurses Libs: -lform Libs.private: -Cflags: -D__EXTENSIONS__ -I${includedir} +Cflags: -D__EXTENSIONS__ diff --git a/contrib/ncurses/menu/menu.pc b/contrib/ncurses/menu/menu.pc index 7191dce444..69b137227f 100644 --- a/contrib/ncurses/menu/menu.pc +++ b/contrib/ncurses/menu/menu.pc @@ -4,7 +4,6 @@ prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include/ncurses abi_version=6 major_version=6 version=6.0.20170916 @@ -16,4 +15,4 @@ URL: http://invisible-island.net/ncurses Requires.private: ncurses Libs: -lmenu Libs.private: -Cflags: -D__EXTENSIONS__ -I${includedir} +Cflags: -D__EXTENSIONS__ diff --git a/contrib/ncurses/ncurses/ncurses.pc b/contrib/ncurses/ncurses/ncurses.pc index 9e7ccd6ad5..c909ba2dc4 100644 --- a/contrib/ncurses/ncurses/ncurses.pc +++ b/contrib/ncurses/ncurses/ncurses.pc @@ -4,7 +4,6 @@ prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include/ncurses abi_version=6 major_version=6 version=6.0.20170916 @@ -16,4 +15,4 @@ URL: http://invisible-island.net/ncurses Requires.private: Libs: -lncurses Libs.private: -Cflags: -D__EXTENSIONS__ -I${includedir} +Cflags: -D__EXTENSIONS__ diff --git a/contrib/ncurses/panel/panel.pc b/contrib/ncurses/panel/panel.pc index 0534ed5565..080d544c31 100644 --- a/contrib/ncurses/panel/panel.pc +++ b/contrib/ncurses/panel/panel.pc @@ -4,7 +4,6 @@ prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include/ncurses abi_version=6 major_version=6 version=6.0.20170916 @@ -16,4 +15,4 @@ URL: http://invisible-island.net/ncurses Requires.private: ncurses Libs: -lpanel Libs.private: -Cflags: -D__EXTENSIONS__ -I${includedir} +Cflags: -D__EXTENSIONS__ diff --git a/lib/libncurses/form/Makefile b/lib/libncurses/form/Makefile index 908206e4b8..7c0e4f316a 100644 --- a/lib/libncurses/form/Makefile +++ b/lib/libncurses/form/Makefile @@ -62,11 +62,11 @@ SHLIB_LDADD+= ${LDADD} HEADERS= form.h includes: - @test -d ${DESTDIR}/usr/include/ncurses || \ - mkdir ${DESTDIR}/usr/include/ncurses + @test -d ${DESTDIR}/usr/include || \ + mkdir ${DESTDIR}/usr/include @for i in $(HEADERS); do \ j="${INSTALL} ${INSTALL_COPY} ${INC_INSTALL_OWN} -m 0644 ${NCURSES_DIR}/form/$$i \ - ${DESTDIR}/usr/include/ncurses"; \ + ${DESTDIR}/usr/include"; \ echo $$j; \ eval "$$j"; \ done; diff --git a/lib/libncurses/menu/Makefile b/lib/libncurses/menu/Makefile index 8cb584c016..71653c76a1 100644 --- a/lib/libncurses/menu/Makefile +++ b/lib/libncurses/menu/Makefile @@ -47,11 +47,11 @@ SHLIB_LDADD+= ${LDADD} HEADERS= menu.h eti.h includes: - @test -d ${DESTDIR}/usr/include/ncurses || \ - mkdir ${DESTDIR}/usr/include/ncurses + @test -d ${DESTDIR}/usr/include || \ + mkdir ${DESTDIR}/usr/include @for i in $(HEADERS); do \ j="${INSTALL} ${INSTALL_COPY} ${INC_INSTALL_OWN} -m 0644 ${NCURSES_DIR}/menu/$$i \ - ${DESTDIR}/usr/include/ncurses"; \ + ${DESTDIR}/usr/include"; \ echo $$j; \ eval "$$j"; \ done; diff --git a/lib/libncurses/ncurses/Makefile b/lib/libncurses/ncurses/Makefile index c24f155b10..0497e6de90 100644 --- a/lib/libncurses/ncurses/Makefile +++ b/lib/libncurses/ncurses/Makefile @@ -276,15 +276,15 @@ SRCS+= charable.c \ includes: curses.h @test -f ${NCURSES_INC}/curses.h || \ mv -f curses.h ${NCURSES_INC} - @test -d ${DESTDIR}/usr/include/ncurses || \ - mkdir -p ${DESTDIR}/usr/include/ncurses + @test -d ${DESTDIR}/usr/include || \ + mkdir -p ${DESTDIR}/usr/include @for i in ${HEADERS}; do \ j="${INSTALL} ${INSTALL_COPY} ${INC_INSTALL_OWN} -m 0644 ${NCURSES_INC}/$$i \ - ${DESTDIR}/usr/include/ncurses"; \ + ${DESTDIR}/usr/include"; \ echo $$j; \ eval "$$j"; \ done; - cd ${DESTDIR}/usr/include/ncurses && ln -fs curses.h ncurses.h + cd ${DESTDIR}/usr/include && ln -fs curses.h ncurses.h pc_files: @test -d ${DESTDIR}/usr/lib/pkgconfig || \ diff --git a/lib/libncurses/panel/Makefile b/lib/libncurses/panel/Makefile index 2e4a4248cf..e9761ff728 100644 --- a/lib/libncurses/panel/Makefile +++ b/lib/libncurses/panel/Makefile @@ -36,11 +36,11 @@ SHLIB_LDADD+= ${LDADD} HEADERS= panel.h includes: - @test -d ${DESTDIR}/usr/include/ncurses || \ - mkdir ${DESTDIR}/usr/include/ncurses + @test -d ${DESTDIR}/usr/include || \ + mkdir ${DESTDIR}/usr/include @for i in $(HEADERS); do \ j="${INSTALL} ${INSTALL_COPY} ${INC_INSTALL_OWN} -m 0644 ${NCURSES_DIR}/panel/$$i \ - ${DESTDIR}/usr/include/ncurses"; \ + ${DESTDIR}/usr/include"; \ echo $$j; \ eval "$$j"; \ done; diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile index cd9c8e0d25..7ec169fd59 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile @@ -51,8 +51,7 @@ CERRWARN += -Wno-uninitialized CERRWARN += -Wno-unused-function # Enable large file support for reading the lastlog file. -finger := CPPFLAGS += -D_FILE_OFFSET_BITS=64 \ - -I$(ROOT)/usr/include/ncurses +finger := CPPFLAGS += -D_FILE_OFFSET_BITS=64 finger := LDLIBS += -lncurses diff --git a/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile b/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile index d89e4168b7..5719000154 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile @@ -39,7 +39,6 @@ POFILE= talk.po CERRWARN += -Wno-uninitialized CPPFLAGS += -DSYSV -DSTRNET -DBSD_COMP -CPPFLAGS += -I$(ROOT)/usr/include/ncurses LDLIBS += -lncurses .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile index eb2e2302d2..1a81b84c14 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile @@ -43,7 +43,6 @@ include ../../../Makefile.cmd CPPFLAGS += -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOLD_ENVIRON CPPFLAGS += $(AUTH_INCLUDES) -CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/ncurses CERRWARN += -Wno-parentheses CERRWARN += -Wno-unused-variable CERRWARN += -Wno-unused-function diff --git a/usr/src/cmd/ipf/tools/Makefile.tools b/usr/src/cmd/ipf/tools/Makefile.tools index 87d8ff86f0..bb2415d7e3 100644 --- a/usr/src/cmd/ipf/tools/Makefile.tools +++ b/usr/src/cmd/ipf/tools/Makefile.tools @@ -61,7 +61,7 @@ LDLIBS += $(LIBBPF) CPPFLAGS += -I. -DIPFILTER_LOOKUP -DIPFILTER_LOG -ipfstat.o := CPPFLAGS += -DSTATETOP -I$(ROOT)/usr/include/ncurses +ipfstat.o := CPPFLAGS += -DSTATETOP ipfstat := LDLIBS += -lncurses ipftest := LDLIBS += -lmd diff --git a/usr/src/cmd/latencytop/Makefile.com b/usr/src/cmd/latencytop/Makefile.com index 4ae6bcac59..6069bdbbe2 100644 --- a/usr/src/cmd/latencytop/Makefile.com +++ b/usr/src/cmd/latencytop/Makefile.com @@ -33,8 +33,7 @@ include ../../Makefile.cmd CERRWARN += -Wno-uninitialized CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ - -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include \ - -I$(ADJUNCT_PROTO)/usr/include/ncurses + -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include C99MODE = $(C99_ENABLE) LDLIBS += -lncurses -ldtrace all install := LDLIBS += -lglib-2.0 diff --git a/usr/src/cmd/ls/Makefile b/usr/src/cmd/ls/Makefile index bd46eb193d..631836a2d1 100644 --- a/usr/src/cmd/ls/Makefile +++ b/usr/src/cmd/ls/Makefile @@ -37,8 +37,6 @@ include ../Makefile.cmd SUBDIRS= $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -CPPFLAGS += -I$(ROOT)/usr/include/ncurses - all := TARGET = all install := TARGET = install clean := TARGET = clean diff --git a/usr/src/cmd/ls/Makefile.com b/usr/src/cmd/ls/Makefile.com index b19142ab00..9f5f64a545 100644 --- a/usr/src/cmd/ls/Makefile.com +++ b/usr/src/cmd/ls/Makefile.com @@ -41,7 +41,6 @@ $(XPG6) := CFLAGS += -DXPG4 -DXPG6 $(XPG6) := CFLAGS64 += -DXPG4 -DXPG6 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -CPPFLAGS += -I$(ROOT)/usr/include/ncurses .KEEP_STATE: diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb index 3419f46add..6768d4f5cc 100644 --- a/usr/src/cmd/mdb/Makefile.mdb +++ b/usr/src/cmd/mdb/Makefile.mdb @@ -93,7 +93,6 @@ SRCS += \ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CPPFLAGS += -D_MDB -I. -I../.. -I../../../common -CPPFLAGS += -I$(NATIVE_ADJUNCT)/include/ncurses C99MODE= $(C99_ENABLE) diff --git a/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile b/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile index 6997689c48..5e88b61791 100644 --- a/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/kmdb/Makefile @@ -57,7 +57,6 @@ STANDLIBS += $(ROOT)/usr/lib/amd64/libstandsaveargs.so INCDIRS += $(CODEMGR_WS)/arch/x86/kernel/platform/i86pc/include INCDIRS += $(SRC)/common/dis/i386 -INCDIRS += $(NATIVE_ADJUNCT)/include/ncurses CPPFLAGS += -DDIS_TEXT diff --git a/usr/src/cmd/more/Makefile b/usr/src/cmd/more/Makefile index 885c37dcac..b33ec448d1 100644 --- a/usr/src/cmd/more/Makefile +++ b/usr/src/cmd/more/Makefile @@ -33,7 +33,6 @@ LDLIBS += -lncurses ROOTLIBDATA= $(DATA:%=$(ROOTLIB)/%) CPPFLAGS += -D_FILE_OFFSET_BITS=64 -CPPFLAGS += -I$(ROOT)/usr/include/ncurses $(ROOTLIBDATA) := FILEMODE = 0644 diff --git a/usr/src/cmd/pg/Makefile b/usr/src/cmd/pg/Makefile index 3ff231ec8d..7dafc4547b 100644 --- a/usr/src/cmd/pg/Makefile +++ b/usr/src/cmd/pg/Makefile @@ -32,7 +32,6 @@ CFLAGS += -DSINGLE LDLIBS += -lgen -lncurses XGETFLAGS += -a -x $(PROG).xcl CPPFLAGS += -D_FILE_OFFSET_BITS=64 -CPPFLAGS += -I$(ROOT)/usr/include/ncurses CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized CERRWARN += -Wno-clobbered diff --git a/usr/src/cmd/powertop/Makefile.com b/usr/src/cmd/powertop/Makefile.com index bfe48124e2..9133ecca82 100644 --- a/usr/src/cmd/powertop/Makefile.com +++ b/usr/src/cmd/powertop/Makefile.com @@ -41,7 +41,6 @@ include ../../Makefile.cmd CERRWARN += -Wno-parentheses CERRWARN += -Wno-uninitialized -CPPFLAGS += -I$(ROOT)/usr/include/ncurses LDLIBS += -lncurses -ldtrace -lkstat FILEMODE = 0555 diff --git a/usr/src/cmd/prstat/Makefile b/usr/src/cmd/prstat/Makefile index ff8cb5200d..93e9a6d1f9 100644 --- a/usr/src/cmd/prstat/Makefile +++ b/usr/src/cmd/prstat/Makefile @@ -42,7 +42,6 @@ POFILE = pprstat.po $(64ONLY)SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) -CPPFLAGS += -I$(ROOT)/usr/include/ncurses all := TARGET = all install := TARGET = install diff --git a/usr/src/cmd/prstat/Makefile.com b/usr/src/cmd/prstat/Makefile.com index dee82fb271..c55ce243a4 100644 --- a/usr/src/cmd/prstat/Makefile.com +++ b/usr/src/cmd/prstat/Makefile.com @@ -31,7 +31,6 @@ SRCS = $(OBJS:%.o=../%.c) include ../../Makefile.cmd -CPPFLAGS += -I$(ROOT)/usr/include/ncurses CERRWARN += -Wno-parentheses LDLIBS += -lncurses -lproject diff --git a/usr/src/cmd/ul/Makefile b/usr/src/cmd/ul/Makefile index 38f885be1d..ee7290c95d 100644 --- a/usr/src/cmd/ul/Makefile +++ b/usr/src/cmd/ul/Makefile @@ -29,7 +29,6 @@ PROG= ul include ../Makefile.cmd -CPPFLAGS += -I$(ROOT)/usr/include/ncurses LDLIBS += -lncurses .KEEP_STATE: diff --git a/usr/src/lib/libtecla/Makefile.com b/usr/src/lib/libtecla/Makefile.com index e656ef5313..2f7053d3fd 100644 --- a/usr/src/lib/libtecla/Makefile.com +++ b/usr/src/lib/libtecla/Makefile.com @@ -43,7 +43,6 @@ CPPFLAGS += -I$(SRCDIR) -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 \ -DHAVE_SYSV_PTY=1 -D__EXTENSIONS__=1 -D_POSIX_C_SOURCE=199506L \ -DPREFER_REENTRANT -CPPFLAGS += -I$(ROOT)/usr/include/ncurses CERRWARN += -Wno-type-limits .KEEP_STATE: diff --git a/usr/src/pkg/manifests/library-ncurses.mf b/usr/src/pkg/manifests/library-ncurses.mf index 264661e05a..07d11658a2 100644 --- a/usr/src/pkg/manifests/library-ncurses.mf +++ b/usr/src/pkg/manifests/library-ncurses.mf @@ -17,7 +17,6 @@ set name=pkg.fmri \ set name=pkg.description \ value="A CRT screen handling and optimization package." set name=pkg.summary value="A CRT screen handling and optimization package." -dir path=usr/include/ncurses dir path=usr/share/man/man3x dir path=usr/share/tabset dir path=usr/share/terminfo @@ -72,15 +71,15 @@ file path=usr/bin/tic mode=0555 file path=usr/bin/toe mode=0555 file path=usr/bin/tput mode=0555 file path=usr/bin/tset mode=0555 -file path=usr/include/ncurses/curses.h mode=0644 -file path=usr/include/ncurses/eti.h mode=0644 -file path=usr/include/ncurses/form.h mode=0644 -file path=usr/include/ncurses/menu.h mode=0644 -file path=usr/include/ncurses/ncurses_dll.h mode=0644 -file path=usr/include/ncurses/panel.h mode=0644 -file path=usr/include/ncurses/term.h mode=0644 -file path=usr/include/ncurses/termcap.h mode=0644 -file path=usr/include/ncurses/unctrl.h mode=0644 +file path=usr/include/curses.h mode=0644 +file path=usr/include/eti.h mode=0644 +file path=usr/include/form.h mode=0644 +file path=usr/include/menu.h mode=0644 +file path=usr/include/ncurses_dll.h mode=0644 +file path=usr/include/panel.h mode=0644 +file path=usr/include/term.h mode=0644 +file path=usr/include/termcap.h mode=0644 +file path=usr/include/unctrl.h mode=0644 file path=usr/lib/$(ARCH64)/libform.so.6.0 mode=0555 file path=usr/lib/$(ARCH64)/libmenu.so.6.0 mode=0555 file path=usr/lib/$(ARCH64)/libncurses.so.6.0 mode=0555 @@ -2961,7 +2960,7 @@ hardlink path=usr/share/terminfo/z/zt-1 target=../h/htx11 hardlink path=usr/share/terminfo/z/ztx target=../h/htx11 hardlink path=usr/share/terminfo/z/ztx-1-a target=../h/htx11 hardlink path=usr/share/terminfo/z/ztx11 target=../h/htx11 -link path=usr/include/ncurses/ncurses.h target=curses.h +link path=usr/include/ncurses.h target=curses.h link path=usr/lib/$(ARCH64)/libform.so target=libform.so.6.0 link path=usr/lib/$(ARCH64)/libform.so.6 target=libform.so.6.0 link path=usr/lib/$(ARCH64)/libmenu.so target=libmenu.so.6.0 -- 2.11.4.GIT