summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/libform/Makefile13
-rw-r--r--lib/ncurses/form/Makefile13
2 files changed, 20 insertions, 6 deletions
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index 5f8a52a..a3d8179 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -4,11 +4,13 @@
NCURSES=${.CURDIR}/../../contrib/ncurses
.PATH: ${NCURSES}/form
-.PATH: ${NCURSES}/menu
+.PATH: ${NCURSES}/include
LIB= form
+AWK?= awk
-SRCS= fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
+SRCS= ncurses_def.h \
+ fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
fld_ftlink.c fld_info.c fld_just.c fld_link.c fld_max.c fld_move.c \
fld_newftyp.c fld_opts.c fld_pad.c fld_page.c fld_stat.c fld_type.c \
fld_user.c frm_cursor.c frm_data.c frm_def.c frm_driver.c frm_hook.c \
@@ -17,7 +19,12 @@ SRCS= fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
fty_ipv4.c fty_num.c fty_regex.c
INCS= ${NCURSES}/form/form.h
-CFLAGS+=-I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
+CLEANFILES+= ncurses_def.h
+CFLAGS+= -I. -I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
-I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H
+ncurses_def.h: MKncurses_def.sh ncurses_defs
+ AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
+ ${NCURSES}/include/ncurses_defs > ncurses_def.h
+
.include <bsd.lib.mk>
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index 5f8a52a..a3d8179 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -4,11 +4,13 @@
NCURSES=${.CURDIR}/../../contrib/ncurses
.PATH: ${NCURSES}/form
-.PATH: ${NCURSES}/menu
+.PATH: ${NCURSES}/include
LIB= form
+AWK?= awk
-SRCS= fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
+SRCS= ncurses_def.h \
+ fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
fld_ftlink.c fld_info.c fld_just.c fld_link.c fld_max.c fld_move.c \
fld_newftyp.c fld_opts.c fld_pad.c fld_page.c fld_stat.c fld_type.c \
fld_user.c frm_cursor.c frm_data.c frm_def.c frm_driver.c frm_hook.c \
@@ -17,7 +19,12 @@ SRCS= fld_arg.c fld_attr.c fld_current.c fld_def.c fld_dup.c fld_ftchoice.c \
fty_ipv4.c fty_num.c fty_regex.c
INCS= ${NCURSES}/form/form.h
-CFLAGS+=-I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
+CLEANFILES+= ncurses_def.h
+CFLAGS+= -I. -I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
-I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H
+ncurses_def.h: MKncurses_def.sh ncurses_defs
+ AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
+ ${NCURSES}/include/ncurses_defs > ncurses_def.h
+
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud