summaryrefslogtreecommitdiff
path: root/usr.sbin/lpr
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-11-25 16:57:27 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-11-25 16:57:27 +0000
commitc6db8143eda5c775467145ac73e8ebec47afdd8f (patch)
tree41890d809d5cd369a149d9fe8cd22b45310c700a /usr.sbin/lpr
parentc97038fa5a6b253c5f2eb3d09a7a529f8ae86220 (diff)
downloadsrc-test2-c6db8143eda5c775467145ac73e8ebec47afdd8f.tar.gz
src-test2-c6db8143eda5c775467145ac73e8ebec47afdd8f.zip
Notes
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r--usr.sbin/lpr/Makefile.inc2
-rw-r--r--usr.sbin/lpr/chkprintcap/Makefile3
-rw-r--r--usr.sbin/lpr/lpc/Makefile5
-rw-r--r--usr.sbin/lpr/lpd/Makefile3
-rw-r--r--usr.sbin/lpr/lpq/Makefile3
-rw-r--r--usr.sbin/lpr/lpr/Makefile3
-rw-r--r--usr.sbin/lpr/lprm/Makefile3
-rw-r--r--usr.sbin/lpr/pac/Makefile3
8 files changed, 8 insertions, 17 deletions
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index 65535e6abac0..59f8ceb1ed55 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -6,6 +6,4 @@
CFLAGS+= -DINET6
.endif
-LIBLPR= ${.OBJDIR}/../common_source/liblpr.a
-
.include "../Makefile.inc"
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index ffffffbb2bd1..aa08882b1076 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile
+++ b/usr.sbin/lpr/chkprintcap/Makefile
@@ -8,7 +8,6 @@ SRCS= chkprintcap.c skimprintcap.c
CFLAGS+= -I${.CURDIR}/../common_source
-DPADD= ${LIBLPR}
-LDADD= ${LIBLPR}
+LIBADD= lpr
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 92ca9e8faf46..43f1f7a71f6b 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -5,7 +5,7 @@
PROG= lpc
MAN= lpc.8
-SRCS= lpc.c cmds.c cmdtab.c movejobs.c
+SRCS= lpc.c cmds.c cmdtab.c movejobs.c
BINGRP= daemon
BINMODE= 2555
@@ -13,7 +13,6 @@ CFLAGS+= -I${.CURDIR}/../common_source
WARNS?= 0
-DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW}
-LDADD= ${LIBLPR} -ledit -ltermcapw
+LIBADD= lpr edit
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 0d7d93ef79d9..a35212bb2cc8 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -9,7 +9,6 @@ CFLAGS+= -I${.CURDIR}/../common_source
WARNS?= 1
-DPADD= ${LIBLPR}
-LDADD= ${LIBLPR}
+LIBADD= lpr
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 4df437e06c32..7ea22fa4cd4d 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -10,7 +10,6 @@ BINMODE= 6555
CFLAGS+= -I${.CURDIR}/../common_source
-DPADD= ${LIBLPR}
-LDADD= ${LIBLPR}
+LIBADD= lpr
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 1894b0089c04..2841a79290eb 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -15,7 +15,6 @@ CFLAGS+= -I${.CURDIR}/../common_source
WARNS?= 2
-DPADD= ${LIBLPR}
-LDADD= ${LIBLPR}
+LIBADD= lpr
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index 44bc93ac27ec..5724d53280e3 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -12,7 +12,6 @@ BINMODE= 6555
CFLAGS+= -I${.CURDIR}/../common_source
-DPADD= ${LIBLPR}
-LDADD= ${LIBLPR}
+LIBADD= lpr
.include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index bd895a71a305..faf8e581c3b9 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -8,7 +8,6 @@ MAN= pac.8
CFLAGS+= -I${.CURDIR}/../common_source
-DPADD= ${LIBLPR}
-LDADD= ${LIBLPR}
+LIBADD= lpr
.include <bsd.prog.mk>