svn commit: r274123 - in head: lib/libdpv usr.bin/dpv

[Devin Teske]

Author: dteske
Date: Wed Nov  5 02:36:28 2014
New Revision: 274123
URL: https://svnweb.freebsd.org/changeset/base/274123

Log:
  Fix buildworld by adding DPADD= to libdpv [dpv(3)] Makefile
  NB: Should also address `make -j' building
  Remove "+" from "+=" in assignments to DPADD/LDADD while here.
  NB: Also move CFLAGS for style measure.
  
  Reviewed by:	shurd
  MFC after:	21 days
  X-MFC-to:	stable/10 stable/9
  X-MFC-with:	274116 274120 274121

Modified:
  head/lib/libdpv/Makefile
  head/usr.bin/dpv/Makefile

Modified: head/lib/libdpv/Makefile
==============================================================================
--- head/lib/libdpv/Makefile	Wed Nov  5 02:08:37 2014	(r274122)
+++ head/lib/libdpv/Makefile	Wed Nov  5 02:36:28 2014	(r274123)
@@ -6,11 +6,13 @@ INCS=		dpv.h
 MAN=		dpv.3
 MLINKS=		dpv.3 dpv_free.3
 
-CFLAGS+=	-I${.CURDIR}
-LDFLAGS+=	-ldialog -lfigpar -lncurses -lutil
+DPADD=		${LIBFIGPAR}
+LDADD=		-ldialog -lfigpar -lncurses -lutil
 
 SRCS=		dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c
 
+CFLAGS+=	-I${.CURDIR}
+
 WARNS?=		6
 
 .include <bsd.lib.mk>

Modified: head/usr.bin/dpv/Makefile
==============================================================================
--- head/usr.bin/dpv/Makefile	Wed Nov  5 02:08:37 2014	(r274122)
+++ head/usr.bin/dpv/Makefile	Wed Nov  5 02:36:28 2014	(r274123)
@@ -4,8 +4,8 @@ PROG=		dpv
 
 CFLAGS+=	-I${.CURDIR}
 
-DPADD+=		${LIBDPV} ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSES} ${LIBUTIL}
-LDADD+=		-ldpv -ldialog -lfigpar -lncurses -lutil
+DPADD=		${LIBDPV} ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSES} ${LIBUTIL}
+LDADD=		-ldpv -ldialog -lfigpar -lncurses -lutil
 
 WARNS?=		6