- style.Makefile(9) fix

- first line is $FreeBSD$
  - Reorder special variables: DPADD, LPADD, CFLAGS
  - Use = instead of += for variables that are initially empty
  - Use space instead of tab after :
  - Use one tab after =
- Use .SUFFIXES for section 3 manual page which simplifies Makefile a lot
- Use SHAREDIR instead of /usr/share
- Remove SRCDIR in INCS since we set .PATH properly
- Use plural in variable name when it stands for more that one source file

Reviewed by:	ru
Approved by:	delphij (mentor)
This commit is contained in:
Rong-En Fan 2007-03-09 09:54:07 +00:00
parent 15543aadb3
commit 557158de64
6 changed files with 931 additions and 933 deletions

View File

@ -1,4 +1,5 @@
# This is to include src/lib/Makefile.inc
# $FreeBSD$
# This is to include src/lib/Makefile.inc
.include "../Makefile.inc"

View File

@ -1,7 +1,7 @@
# This Makefile is shared by libncurses, libform, libmenu, libpanel.
#
# $FreeBSD$
# This Makefile is shared by libncurses, libform, libmenu, libpanel.
NCURSES_DIR= ${.CURDIR}/../../../contrib/ncurses
NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h

View File

@ -1,165 +1,164 @@
# Makefile for libform
# $FreeBSD$
.include "${.CURDIR}/../config.mk"
.include "${.CURDIR}/../config.mk"
SRCDIR= ${NCURSES_DIR}/form
SRCDIR= ${NCURSES_DIR}/form
LIB= form
DPADD= ${LIBNCURSES}
LDADD= -lncurses
LIB= form
.PATH: ${SRCDIR}
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 \
frm_opts.c \
frm_page.c \
frm_post.c \
frm_req_name.c \
frm_scale.c \
frm_sub.c \
frm_user.c \
frm_win.c \
fty_alnum.c \
fty_alpha.c \
fty_enum.c \
fty_int.c \
fty_ipv4.c \
fty_num.c \
fty_regex.c
.PATH: ${SRCDIR}
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 \
frm_opts.c \
frm_page.c \
frm_post.c \
frm_req_name.c \
frm_scale.c \
frm_sub.c \
frm_user.c \
frm_win.c \
fty_alnum.c \
fty_alpha.c \
fty_enum.c \
fty_int.c \
fty_ipv4.c \
fty_num.c \
fty_regex.c
CLEANFILES= ncurses_def.h
CFLAGS+= -I${SRCDIR}
CFLAGS+= -I${NCURSES_DIR}/menu
INCS= ${SRCDIR}/form.h
DPADD= ${LIBNCURSES}
LDADD= -lncurses
CLEANFILES+= ncurses_def.h
INCS= form.h
.PATH: ${NCURSES_DIR}/man
MANx= \
form.3x \
form_cursor.3x \
form_data.3x \
form_driver.3x \
form_field.3x \
form_field_attributes.3x \
form_field_buffer.3x \
form_field_info.3x \
form_field_just.3x \
form_field_new.3x \
form_field_opts.3x \
form_field_userptr.3x \
form_field_validation.3x \
form_fieldtype.3x \
form_hook.3x \
form_new.3x \
form_new_page.3x \
form_opts.3x \
form_page.3x \
form_post.3x \
form_requestname.3x \
form_userptr.3x \
form_win.3x
# Generate the MAN list from MANx
.for page in ${MANx}
CLEANFILES+= ${page:T:S/x$//g}
MAN+= ${page:T:S/x$//g}
${page:T:S/x$//g}: ${page}
cat ${.ALLSRC} > ${.TARGET}
.endfor
.PATH: ${NCURSES_DIR}/man
MAN= \
form.3 \
form_cursor.3 \
form_data.3 \
form_driver.3 \
form_field.3 \
form_field_attributes.3 \
form_field_buffer.3 \
form_field_info.3 \
form_field_just.3 \
form_field_new.3 \
form_field_opts.3 \
form_field_userptr.3 \
form_field_validation.3 \
form_fieldtype.3 \
form_hook.3 \
form_new.3 \
form_new_page.3 \
form_opts.3 \
form_page.3 \
form_post.3 \
form_requestname.3 \
form_userptr.3 \
form_win.3
MLINKS= form_cursor.3 pos_form_cursor.3 \
form_data.3 data_ahead.3 \
form_data.3 data_behind.3 \
form_field.3 field_count.3 \
form_field.3 form_fields.3 \
form_field.3 move_field.3 \
form_field.3 set_form_fields.3 \
form_field_attributes.3 field_back.3 \
form_field_attributes.3 field_fore.3 \
form_field_attributes.3 field_pad.3 \
form_field_attributes.3 set_field_back.3 \
form_field_attributes.3 set_field_fore.3 \
form_field_attributes.3 set_field_pad.3 \
form_field_buffer.3 field_buffer.3 \
form_field_buffer.3 field_status.3 \
form_field_buffer.3 set_field_buffer.3 \
form_field_buffer.3 set_field_status.3 \
form_field_buffer.3 set_max_field.3 \
form_field_info.3 dynamic_fieldinfo.3 \
form_field_info.3 field_info.3 \
form_field_just.3 field_just.3 \
form_field_just.3 set_field_just.3 \
form_field_new.3 dup_field.3 \
form_field_new.3 free_field.3 \
form_field_new.3 link_field.3 \
form_field_new.3 new_field.3 \
form_field_opts.3 field_opts.3 \
form_field_opts.3 field_opts_off.3 \
form_field_opts.3 field_opts_on.3 \
form_field_opts.3 set_field_opts.3 \
form_field_userptr.3 field_userptr.3 \
form_field_userptr.3 set_field_userptr.3 \
form_field_validation.3 field_arg.3 \
form_field_validation.3 field_type.3 \
form_field_validation.3 set_field_type.3 \
form_fieldtype.3 free_fieldtype.3 \
form_fieldtype.3 link_fieldtype.3 \
form_fieldtype.3 new_fieldtype.3 \
form_fieldtype.3 set_fieldtype_arg.3 \
form_fieldtype.3 set_fieldtype_choice.3 \
form_hook.3 field_init.3 \
form_hook.3 field_term.3 \
form_hook.3 form_init.3 \
form_hook.3 form_term.3 \
form_hook.3 set_field_init.3 \
form_hook.3 set_field_term.3 \
form_hook.3 set_form_init.3 \
form_hook.3 set_form_term.3 \
form_new.3 free_form.3 \
form_new.3 new_form.3 \
form_new_page.3 new_page.3 \
form_new_page.3 set_new_page.3 \
form_opts.3 form_opts_off.3 \
form_opts.3 form_opts_on.3 \
form_opts.3 set_form_opts.3 \
form_page.3 current_field.3 \
form_page.3 field_index.3 \
form_page.3 set_current_field.3 \
form_page.3 set_form_page.3 \
form_post.3 post_form.3 \
form_post.3 unpost_form.3 \
form_requestname.3 form_request_by_name.3 \
form_requestname.3 form_request_name.3 \
form_userptr.3 set_form_userptr.3 \
form_win.3 form_sub.3 \
form_win.3 scale_form.3 \
form_win.3 set_form_sub.3 \
form_win.3 set_form_win.3
CLEANFILES+= ${MAN:M*.3}
MLINKS= form_cursor.3 pos_form_cursor.3 \
form_data.3 data_ahead.3 \
form_data.3 data_behind.3 \
form_field.3 field_count.3 \
form_field.3 form_fields.3 \
form_field.3 move_field.3 \
form_field.3 set_form_fields.3 \
form_field_attributes.3 field_back.3 \
form_field_attributes.3 field_fore.3 \
form_field_attributes.3 field_pad.3 \
form_field_attributes.3 set_field_back.3 \
form_field_attributes.3 set_field_fore.3 \
form_field_attributes.3 set_field_pad.3 \
form_field_buffer.3 field_buffer.3 \
form_field_buffer.3 field_status.3 \
form_field_buffer.3 set_field_buffer.3 \
form_field_buffer.3 set_field_status.3 \
form_field_buffer.3 set_max_field.3 \
form_field_info.3 dynamic_fieldinfo.3 \
form_field_info.3 field_info.3 \
form_field_just.3 field_just.3 \
form_field_just.3 set_field_just.3 \
form_field_new.3 dup_field.3 \
form_field_new.3 free_field.3 \
form_field_new.3 link_field.3 \
form_field_new.3 new_field.3 \
form_field_opts.3 field_opts.3 \
form_field_opts.3 field_opts_off.3 \
form_field_opts.3 field_opts_on.3 \
form_field_opts.3 set_field_opts.3 \
form_field_userptr.3 field_userptr.3 \
form_field_userptr.3 set_field_userptr.3 \
form_field_validation.3 field_arg.3 \
form_field_validation.3 field_type.3 \
form_field_validation.3 set_field_type.3 \
form_fieldtype.3 free_fieldtype.3 \
form_fieldtype.3 link_fieldtype.3 \
form_fieldtype.3 new_fieldtype.3 \
form_fieldtype.3 set_fieldtype_arg.3 \
form_fieldtype.3 set_fieldtype_choice.3 \
form_hook.3 field_init.3 \
form_hook.3 field_term.3 \
form_hook.3 form_init.3 \
form_hook.3 form_term.3 \
form_hook.3 set_field_init.3 \
form_hook.3 set_field_term.3 \
form_hook.3 set_form_init.3 \
form_hook.3 set_form_term.3 \
form_new.3 free_form.3 \
form_new.3 new_form.3 \
form_new_page.3 new_page.3 \
form_new_page.3 set_new_page.3 \
form_opts.3 form_opts_off.3 \
form_opts.3 form_opts_on.3 \
form_opts.3 set_form_opts.3 \
form_page.3 current_field.3 \
form_page.3 field_index.3 \
form_page.3 set_current_field.3 \
form_page.3 set_form_page.3 \
form_post.3 post_form.3 \
form_post.3 unpost_form.3 \
form_requestname.3 form_request_by_name.3 \
form_requestname.3 form_request_name.3 \
form_userptr.3 set_form_userptr.3 \
form_win.3 form_sub.3 \
form_win.3 scale_form.3 \
form_win.3 set_form_sub.3 \
form_win.3 set_form_win.3
.include <bsd.lib.mk>
# Keep the .SUFFIXES line after the include of bsd.lib.mk
.SUFFIXES: .3 .3x
.3x.3:
cat ${.IMPSRC} > ${.TARGET}

View File

@ -1,138 +1,137 @@
# Makefile for libmenu
# $FreeBSD$
.include "${.CURDIR}/../config.mk"
.include "${.CURDIR}/../config.mk"
SRCDIR= ${NCURSES_DIR}/menu
SRCDIR= ${NCURSES_DIR}/menu
LIB= menu
DPADD= ${LIBNCURSES}
LDADD= -lncurses
LIB= menu
.PATH: ${SRCDIR}
SRCS= \
ncurses_def.h \
m_attribs.c \
m_cursor.c \
m_driver.c \
m_format.c \
m_global.c \
m_hook.c \
m_item_cur.c \
m_item_nam.c \
m_item_new.c \
m_item_opt.c \
m_item_top.c \
m_item_use.c \
m_item_val.c \
m_item_vis.c \
m_items.c \
m_new.c \
m_opts.c \
m_pad.c \
m_pattern.c \
m_post.c \
m_req_name.c \
m_scale.c \
m_spacing.c \
m_sub.c \
m_userptr.c \
m_win.c
.PATH: ${SRCDIR}
SRCS= \
ncurses_def.h \
m_attribs.c \
m_cursor.c \
m_driver.c \
m_format.c \
m_global.c \
m_hook.c \
m_item_cur.c \
m_item_nam.c \
m_item_new.c \
m_item_opt.c \
m_item_top.c \
m_item_use.c \
m_item_val.c \
m_item_vis.c \
m_items.c \
m_new.c \
m_opts.c \
m_pad.c \
m_pattern.c \
m_post.c \
m_req_name.c \
m_scale.c \
m_spacing.c \
m_sub.c \
m_userptr.c \
m_win.c
CLEANFILES= ncurses_def.h
CFLAGS+= -I${SRCDIR}
INCS= ${SRCDIR}/menu.h ${SRCDIR}/eti.h
DPADD= ${LIBNCURSES}
LDADD= -lncurses
CLEANFILES+= ncurses_def.h
INCS= menu.h eti.h
.PATH: ${NCURSES_DIR}/man
MANx= \
menu.3x \
menu_attributes.3x \
menu_cursor.3x \
menu_driver.3x \
menu_format.3x \
menu_hook.3x \
menu_items.3x \
menu_mark.3x \
menu_new.3x \
menu_opts.3x \
menu_pattern.3x \
menu_post.3x \
menu_requestname.3x \
menu_spacing.3x \
menu_userptr.3x \
menu_win.3x \
mitem_current.3x \
mitem_name.3x \
mitem_new.3x \
mitem_opts.3x \
mitem_userptr.3x \
mitem_value.3x \
mitem_visible.3x
.PATH: ${NCURSES_DIR}/man
MAN= \
menu.3 \
menu_attributes.3 \
menu_cursor.3 \
menu_driver.3 \
menu_format.3 \
menu_hook.3 \
menu_items.3 \
menu_mark.3 \
menu_new.3 \
menu_opts.3 \
menu_pattern.3 \
menu_post.3 \
menu_requestname.3 \
menu_spacing.3 \
menu_userptr.3 \
menu_win.3 \
mitem_current.3 \
mitem_name.3 \
mitem_new.3 \
mitem_opts.3 \
mitem_userptr.3 \
mitem_value.3 \
mitem_visible.3
# Generate the MAN list from MANx
.for page in ${MANx}
CLEANFILES+= ${page:T:S/x$//g}
MAN+= ${page:T:S/x$//g}
${page:T:S/x$//g}: ${page}
cat ${.ALLSRC} > ${.TARGET}
.endfor
CLEANFILES+= ${MAN:M*.3}
MLINKS= menu_attributes.3 menu_back.3 \
menu_attributes.3 menu_fore.3 \
menu_attributes.3 menu_grey.3 \
menu_attributes.3 menu_pad.3 \
menu_attributes.3 set_menu_back.3 \
menu_attributes.3 set_menu_fore.3 \
menu_attributes.3 set_menu_grey.3 \
menu_attributes.3 set_menu_pad.3 \
menu_cursor.3 pos_menu_cursor.3 \
menu_format.3 set_menu_format.3 \
menu_hook.3 item_init.3 \
menu_hook.3 item_term.3 \
menu_hook.3 menu_init.3 \
menu_hook.3 menu_term.3 \
menu_hook.3 set_item_init.3 \
menu_hook.3 set_item_term.3 \
menu_hook.3 set_menu_init.3 \
menu_hook.3 set_menu_term.3 \
menu_items.3 item_count.3 \
menu_items.3 set_menu_items.3 \
menu_mark.3 set_menu_mark.3 \
menu_new.3 free_menu.3 \
menu_new.3 new_menu.3 \
menu_opts.3 menu_opts_off.3 \
menu_opts.3 menu_opts_on.3 \
menu_opts.3 set_menu_opts.3 \
menu_pattern.3 set_menu_pattern.3 \
menu_post.3 post_menu.3 \
menu_post.3 unpost_menu.3 \
menu_requestname.3 menu_request_by_name.3 \
menu_requestname.3 menu_request_name.3 \
menu_spacing.3 set_menu_spacing.3 \
menu_userptr.3 set_menu_userptr.3 \
menu_win.3 menu_sub.3 \
menu_win.3 scale_menu.3 \
menu_win.3 set_menu_sub.3 \
menu_win.3 set_menu_win.3 \
mitem_current.3 current_item.3 \
mitem_current.3 item_index.3 \
mitem_current.3 set_current_item.3 \
mitem_current.3 set_top_row.3 \
mitem_current.3 top_row.3 \
mitem_name.3 item_description.3 \
mitem_name.3 item_name.3 \
mitem_new.3 free_item.3 \
mitem_new.3 new_item.3 \
mitem_opts.3 item_opts.3 \
mitem_opts.3 item_opts_off.3 \
mitem_opts.3 item_opts_on.3 \
mitem_opts.3 set_item_opts.3 \
mitem_userptr.3 item_userptr.3 \
mitem_userptr.3 set_item_userptr.3 \
mitem_value.3 item_value.3 \
mitem_value.3 set_item_value.3 \
mitem_visible.3 item_visible.3
MLINKS= menu_attributes.3 menu_back.3 \
menu_attributes.3 menu_fore.3 \
menu_attributes.3 menu_grey.3 \
menu_attributes.3 menu_pad.3 \
menu_attributes.3 set_menu_back.3 \
menu_attributes.3 set_menu_fore.3 \
menu_attributes.3 set_menu_grey.3 \
menu_attributes.3 set_menu_pad.3 \
menu_cursor.3 pos_menu_cursor.3 \
menu_format.3 set_menu_format.3 \
menu_hook.3 item_init.3 \
menu_hook.3 item_term.3 \
menu_hook.3 menu_init.3 \
menu_hook.3 menu_term.3 \
menu_hook.3 set_item_init.3 \
menu_hook.3 set_item_term.3 \
menu_hook.3 set_menu_init.3 \
menu_hook.3 set_menu_term.3 \
menu_items.3 item_count.3 \
menu_items.3 set_menu_items.3 \
menu_mark.3 set_menu_mark.3 \
menu_new.3 free_menu.3 \
menu_new.3 new_menu.3 \
menu_opts.3 menu_opts_off.3 \
menu_opts.3 menu_opts_on.3 \
menu_opts.3 set_menu_opts.3 \
menu_pattern.3 set_menu_pattern.3 \
menu_post.3 post_menu.3 \
menu_post.3 unpost_menu.3 \
menu_requestname.3 menu_request_by_name.3 \
menu_requestname.3 menu_request_name.3 \
menu_spacing.3 set_menu_spacing.3 \
menu_userptr.3 set_menu_userptr.3 \
menu_win.3 menu_sub.3 \
menu_win.3 scale_menu.3 \
menu_win.3 set_menu_sub.3 \
menu_win.3 set_menu_win.3 \
mitem_current.3 current_item.3 \
mitem_current.3 item_index.3 \
mitem_current.3 set_current_item.3 \
mitem_current.3 set_top_row.3 \
mitem_current.3 top_row.3 \
mitem_name.3 item_description.3 \
mitem_name.3 item_name.3 \
mitem_new.3 free_item.3 \
mitem_new.3 new_item.3 \
mitem_opts.3 item_opts.3 \
mitem_opts.3 item_opts_off.3 \
mitem_opts.3 item_opts_on.3 \
mitem_opts.3 set_item_opts.3 \
mitem_userptr.3 item_userptr.3 \
mitem_userptr.3 set_item_userptr.3 \
mitem_value.3 item_value.3 \
mitem_value.3 set_item_value.3 \
mitem_visible.3 item_visible.3
.include <bsd.lib.mk>
# Keep the .SUFFIXES line after the include of bsd.lib.mk
.SUFFIXES: .3 .3x
.3x.3:
cat ${.IMPSRC} > ${.TARGET}

File diff suppressed because it is too large Load Diff

View File

@ -1,66 +1,65 @@
# Makefile for libpanel
# $FreeBSD$
.include "${.CURDIR}/../config.mk"
.include "${.CURDIR}/../config.mk"
SRCDIR= ${NCURSES_DIR}/panel
SRCDIR= ${NCURSES_DIR}/panel
LIB= panel
DPADD= ${LIBNCURSES}
LDADD= -lncurses
LIB= panel
.PATH: ${SRCDIR}
SRCS= \
ncurses_def.h \
p_above.c \
p_below.c \
p_bottom.c \
p_delete.c \
p_hidden.c \
p_hide.c \
p_move.c \
p_new.c \
p_replace.c \
p_show.c \
p_top.c \
p_update.c \
p_user.c \
p_win.c \
panel.c
.PATH: ${SRCDIR}
SRCS= \
ncurses_def.h \
p_above.c \
p_below.c \
p_bottom.c \
p_delete.c \
p_hidden.c \
p_hide.c \
p_move.c \
p_new.c \
p_replace.c \
p_show.c \
p_top.c \
p_update.c \
p_user.c \
p_win.c \
panel.c
CLEANFILES= ncurses_def.h
CFLAGS+= -I${SRCDIR}
INCS= ${SRCDIR}/panel.h
DPADD= ${LIBNCURSES}
LDADD= -lncurses
CLEANFILES+= ncurses_def.h
INCS= panel.h
# generate MAN
.PATH: ${NCURSES_DIR}/man
MANx= \
panel.3x
.PATH: ${NCURSES_DIR}/man
MAN= \
panel.3
# Generate the MAN list from MANx
.for page in ${MANx}
CLEANFILES+= ${page:T:S/x$//g}
MAN+= ${page:T:S/x$//g}
${page:T:S/x$//g}: ${page}
cat ${.ALLSRC} > ${.TARGET}
.endfor
CLEANFILES+= ${MAN:M*.3}
MLINKS= panel.3 bottom_panel.3 \
panel.3 del_panel.3 \
panel.3 hide_panel.3 \
panel.3 move_panel.3 \
panel.3 new_panel.3 \
panel.3 panel_above.3 \
panel.3 panel_below.3 \
panel.3 panel_hidden.3 \
panel.3 panel_userptr.3 \
panel.3 panel_window.3 \
panel.3 replace_panel.3 \
panel.3 set_panel_userptr.3 \
panel.3 show_panel.3 \
panel.3 top_panel.3 \
panel.3 update_panels.3
MLINKS= panel.3 bottom_panel.3 \
panel.3 del_panel.3 \
panel.3 hide_panel.3 \
panel.3 move_panel.3 \
panel.3 new_panel.3 \
panel.3 panel_above.3 \
panel.3 panel_below.3 \
panel.3 panel_hidden.3 \
panel.3 panel_userptr.3 \
panel.3 panel_window.3 \
panel.3 replace_panel.3 \
panel.3 set_panel_userptr.3 \
panel.3 show_panel.3 \
panel.3 top_panel.3 \
panel.3 update_panels.3
.include <bsd.lib.mk>
# Keep the .SUFFIXES line after the include of bsd.lib.mk
.SUFFIXES: .3 .3x
.3x.3:
cat ${.IMPSRC} > ${.TARGET}