diff options
Diffstat (limited to 'gnu/usr.bin/groff')
19 files changed, 53 insertions, 68 deletions
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile index cb83deaf10de..ba760258ee6e 100644 --- a/gnu/usr.bin/groff/Makefile +++ b/gnu/usr.bin/groff/Makefile @@ -6,4 +6,6 @@ SUBDIR= contrib font man src tmac SUBDIR_DEPEND_${subdir}= src .endfor +SUBDIR_PARALLEL= + .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile index 37454406520a..948e9fa8b0e6 100644 --- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile +++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile @@ -2,8 +2,9 @@ PROG_CXX= grodvi SRCS= dvi.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD= ${LIBDRIVER} ${LIBGROFF} +LDADD= ${LIBDRIVER} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index 321f1c87c822..5b55436ca91e 100644 --- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile +++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile @@ -2,8 +2,9 @@ PROG_CXX= post-grohtml SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD= ${LIBDRIVER} ${LIBGROFF} +LDADD= ${LIBDRIVER} ${LIBGROFF} +LIBADD= m MAN= .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile index 85a41c169b95..23a3161b872d 100644 --- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile @@ -2,8 +2,9 @@ PROG_CXX= grolbp SRCS= lbp.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD= ${LIBDRIVER} ${LIBGROFF} +LDADD= ${LIBDRIVER} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile index bb3f9e4f62d3..eeaeca92ae3b 100644 --- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile @@ -3,8 +3,9 @@ PROG_CXX= grolj4 MAN= grolj4.1 lj4_font.5 SRCS= lj4.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD= ${LIBDRIVER} ${LIBGROFF} +LDADD= ${LIBDRIVER} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile index 4511f69b152e..8c83acd14910 100644 --- a/gnu/usr.bin/groff/src/devices/grops/Makefile +++ b/gnu/usr.bin/groff/src/devices/grops/Makefile @@ -2,8 +2,9 @@ PROG_CXX= grops SRCS= ps.cpp psrm.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD= ${LIBDRIVER} ${LIBGROFF} +LDADD= ${LIBDRIVER} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile index d15ee8bf6231..c4de8f4c433a 100644 --- a/gnu/usr.bin/groff/src/devices/grotty/Makefile +++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile @@ -2,8 +2,9 @@ PROG_CXX= grotty SRCS= tty.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD= ${LIBDRIVER} ${LIBGROFF} +LDADD= ${LIBDRIVER} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/xditview/Makefile b/gnu/usr.bin/groff/src/devices/xditview/Makefile deleted file mode 100644 index 91bfcf3b3224..000000000000 --- a/gnu/usr.bin/groff/src/devices/xditview/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $FreeBSD$ - -PROG= gxditview -SRCS= device.c draw.c Dvi.c font.c lex.c page.c parse.c xditview.c -DPADD= ${LIBM} -LDADD= -lm -CLEANFILES= ${MAN} - -GENHDRS= GXditview-ad.h -SRCS+= ${GENHDRS} -CFLAGS+= -I. -CLEANFILES+= ${GENHDRS} - -GXditview-ad.h: GXditview.ad - ${SHELL} ${DIST_DIR}/ad2c ${.ALLSRC} >${.TARGET} - -# libxutil -SRCS+= DviChar.c XFontName.c xmalloc.c - -# X11 glue -CFLAGS+= -I${X11BASE}/include -LDFLAGS= -L${X11BASE}/lib -DPADD+= ${X11BASE}/lib/libXaw.a -LDADD+= -lXaw - -BINDIR= ${X11BASE}/bin -MANDIR= ${X11BASE}/man/man -FILESDIR= ${X11BASE}/lib/X11/app-defaults -FILES= GXditview.ad -FILESNAME= GXditview - -.include <bsd.prog.mk> - -.PATH: ${GROFF_DIST}/src/libs/libxutil diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile index 58309d2a5eb8..7f2e3018fc1a 100644 --- a/gnu/usr.bin/groff/src/preproc/grn/Makefile +++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile @@ -2,8 +2,9 @@ PROG_CXX= grn SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile index 3b5939c3bff1..18a2cd916ee6 100644 --- a/gnu/usr.bin/groff/src/preproc/pic/Makefile +++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile @@ -4,8 +4,9 @@ PROG_CXX= pic SRCS= lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \ common.cpp troff.cpp tex.cpp CFLAGS+= -I${DIST_DIR} -I. -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h pic_tab.h: pic.cpp diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile index 8a18f6f7987c..78fc96b2bce2 100644 --- a/gnu/usr.bin/groff/src/preproc/refer/Makefile +++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile @@ -3,8 +3,9 @@ PROG_CXX= refer SRCS= command.cpp label.cpp ref.cpp refer.cpp token.cpp CFLAGS+= -I${DIST_DIR} -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD= ${LIBBIB} ${LIBGROFF} +LDADD= ${LIBBIB} ${LIBGROFF} +LIBADD= m CLEANFILES= label.cpp label_tab.h ${MAN} y.tab.c y.tab.h .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile index 29e7ac238f89..5bf1980af6ba 100644 --- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile +++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile @@ -2,8 +2,9 @@ PROG_CXX= tbl SRCS= main.cpp table.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile index 2ae541bbb502..54d80102dfa0 100644 --- a/gnu/usr.bin/groff/src/roff/groff/Makefile +++ b/gnu/usr.bin/groff/src/roff/groff/Makefile @@ -2,8 +2,9 @@ PROG_CXX= groff SRCS= groff.cpp pipeline.c -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile index 802af2b6be09..9108ab4374f1 100644 --- a/gnu/usr.bin/groff/src/roff/troff/Makefile +++ b/gnu/usr.bin/groff/src/roff/troff/Makefile @@ -3,8 +3,9 @@ PROG_CXX= troff SRCS= dictionary.cpp div.cpp env.cpp input.cpp \ majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= majorminor.cpp ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile index 1376702a9a83..d3ca4f516e78 100644 --- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile @@ -2,8 +2,9 @@ PROG_CXX= hpftodit SRCS= hpftodit.cpp hpuni.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile index 048fed0ed4a0..b9667fdff8a4 100644 --- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile @@ -2,8 +2,9 @@ PROG_CXX= indxbib SRCS= indxbib.cpp signal.c -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD= ${LIBBIB} ${LIBGROFF} +LDADD= ${LIBBIB} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} FILES= ${DIST_DIR}/eign FILESDIR= ${SHAREDIR}/dict/ diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile index f30dc56cbb8f..3a95268f9d10 100644 --- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile @@ -2,8 +2,9 @@ PROG_CXX= lkbib SRCS= lkbib.cpp -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD= ${LIBBIB} ${LIBGROFF} +LDADD= ${LIBBIB} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile index 18834a7432d3..b12f7b7c7191 100644 --- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile @@ -2,8 +2,9 @@ PROG_CXX= lookbib SRCS= lookbib.cpp -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD= ${LIBBIB} ${LIBGROFF} +LDADD= ${LIBBIB} ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile index ba3bbc54646f..03f51bdae852 100644 --- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile @@ -2,8 +2,9 @@ PROG_CXX= tfmtodit SRCS= tfmtodit.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include <bsd.prog.mk> |