===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/Makefile,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** src/usr.bin/mandoc/Makefile	2017/03/03 14:21:41	1.105
--- src/usr.bin/mandoc/Makefile	2017/04/29 12:43:55	1.106
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.105 2017/03/03 14:21:41 schwarze Exp $
  
  .include <bsd.own.mk>
  
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.106 2017/04/29 12:43:55 schwarze Exp $
  
  .include <bsd.own.mk>
  
***************
*** 8,16 ****
  
  SRCS=	mandoc.c mandoc_aux.c mandoc_ohash.c preconv.c read.c \
  	roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c
! SRCS+=	mdoc_macro.c mdoc.c mdoc_hash.c \
  	mdoc_argv.c mdoc_state.c mdoc_validate.c att.c msec.c st.c
! SRCS+=	man_macro.c man.c man_hash.c man_validate.c
  SRCS+=	main.c mdoc_term.c tag.c chars.c term.c tree.c man_term.c eqn_term.c
  SRCS+=	mdoc_man.c
  SRCS+=	html.c mdoc_html.c man_html.c out.c eqn_html.c
--- 8,16 ----
  
  SRCS=	mandoc.c mandoc_aux.c mandoc_ohash.c preconv.c read.c \
  	roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c
! SRCS+=	mdoc_macro.c mdoc.c \
  	mdoc_argv.c mdoc_state.c mdoc_validate.c att.c msec.c st.c
! SRCS+=	man_macro.c man.c man_validate.c
  SRCS+=	main.c mdoc_term.c tag.c chars.c term.c tree.c man_term.c eqn_term.c
  SRCS+=	mdoc_man.c
  SRCS+=	html.c mdoc_html.c man_html.c out.c eqn_html.c
***************
*** 42,50 ****
  # To install, run:	sudo make installcgi
  # After that, read:	man man.cgi.8
  
! LIBMDOC_OBJS =	mdoc_argv.o mdoc_hash.o mdoc_macro.o mdoc_state.o \
  		mdoc_validate.o mdoc.o att.o st.o
! LIBMAN_OBJS =	man.o man_hash.o man_macro.o man_validate.o
  LIBROFF_OBJS =	roff.o eqn.o tbl.o tbl_data.o tbl_layout.o tbl_opts.o
  LIBMANDOC_OBJS = ${LIBMDOC_OBJS} ${LIBMAN_OBJS} ${LIBROFF_OBJS} \
  		mandoc.o mandoc_aux.o mandoc_ohash.o \
--- 42,50 ----
  # To install, run:	sudo make installcgi
  # After that, read:	man man.cgi.8
  
! LIBMDOC_OBJS =	mdoc_argv.o mdoc_macro.o mdoc_state.o \
  		mdoc_validate.o mdoc.o att.o st.o
! LIBMAN_OBJS =	man.o man_macro.o man_validate.o
  LIBROFF_OBJS =	roff.o eqn.o tbl.o tbl_data.o tbl_layout.o tbl_opts.o
  LIBMANDOC_OBJS = ${LIBMDOC_OBJS} ${LIBMAN_OBJS} ${LIBROFF_OBJS} \
  		mandoc.o mandoc_aux.o mandoc_ohash.o \