Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

This commit is contained in:
ru 2004-02-05 22:44:25 +00:00
parent 5d21c38b89
commit 743cc6d002
47 changed files with 94 additions and 95 deletions

View File

@ -14,8 +14,8 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} y.tab.h
# utilities of the same name are handled with the associated manpage,
# builtin.1 in share/man/man1/.
DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
LDADD+= -ll -ledit -ltermcap
DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
LDADD= -ll -ledit -ltermcap
LFLAGS= -8 # 8-bit lex scanner for arithmetic
CFLAGS+=-DSHELL -I. -I${.CURDIR}

View File

@ -7,8 +7,8 @@ CFLAGS+=-I${.CURDIR}/../primes
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
CFLAGS+=-DHAVE_OPENSSL
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
LDADD= -lcrypto
DPADD= ${LIBCRYPTO}
.endif
MAN= factor.6

View File

@ -17,8 +17,8 @@ EXAMPLES= Makefile check1.c check2.c check3.c dselect.c fselect.c \
CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE
LDADD+= -lncurses
DPADD+= ${LIBNCURSES}
LDADD= -lncurses
DPADD= ${LIBNCURSES}
.if !defined(NOHTML)
afterinstall:

View File

@ -18,8 +18,8 @@ CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR}
CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated
#LDFLAGS+= -Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map
LDADD+= -lm
DPADD+= ${LIBM}
LDADD= -lm
DPADD= ${LIBM}
# libstdc++ sources (libstdc++/src/Makefile.in, do not reorder)
SRCS+= bitset.cc codecvt.cc complex_io.cc concept-inst.cc ctype.cc \

View File

@ -14,7 +14,7 @@ NOMAN= 1
CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
.include <bsd.prog.mk>

View File

@ -10,8 +10,8 @@ NOMAN= 1
CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\"
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
cplus-dem+%DIKED.c: cplus-dem.c
sed -e 's/^xmalloc[ ]/_DONT_xmalloc /g' \

View File

@ -16,7 +16,7 @@ MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
.include <bsd.prog.mk>

View File

@ -12,8 +12,8 @@ NOSHARED?=yes
CFLAGS+= -I.
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
#-----------------------------------------------------------------------
# C parser

View File

@ -12,8 +12,8 @@ NOSHARED?=yes
CFLAGS+= -I${GCCDIR}/objc -I.
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
#-----------------------------------------------------------------------
# objc parser

View File

@ -17,8 +17,8 @@ NOSHARED?=yes
CFLAGS+= -I${GCCDIR}/cp -I.
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
#-----------------------------------------------------------------------
# C++ parser

View File

@ -11,8 +11,8 @@ BINDIR= /usr/libexec
NOMAN= 1
NOSHARED?=yes
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
#-----------------------------------------------------------------------
# C parser

View File

@ -8,7 +8,7 @@ PROG= collect2
SRCS= collect2.c cp-demangle.c cplus-dem.c tlink.c
NOMAN=
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
.include <bsd.prog.mk>

View File

@ -11,8 +11,8 @@ SRCS= gcc.c cppspec.c
CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
CLEANFILES= cpp.1

View File

@ -11,8 +11,8 @@ BINDIR= /usr/libexec
NOMAN= 1
NOSHARED?=yes
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
#-----------------------------------------------------------------------
# C parser

View File

@ -9,8 +9,8 @@ SRCS= tradcpp.c tradcif+%DIKED.c
BINDIR= /usr/libexec
NOMAN= 1
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
DPADD= ${LIBCC_INT}
LDADD= ${LIBCC_INT}
tradcif+%DIKED.c: tradcif.c
sed -e "s/malloc/xmalloc/g" \

View File

@ -27,8 +27,8 @@ SRCS= add.c admin.c annotate.c buffer.c \
CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H \
-I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
DPADD+= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION

View File

@ -7,7 +7,7 @@ PROG= dialog
CFLAGS+= -Wall -Wstrict-prototypes
DPADD+= $(LIBDIALOG) $(LIBNCURSES)
LDADD+= -ldialog -lncurses
DPADD= $(LIBDIALOG) $(LIBNCURSES)
LDADD= -ldialog -lncurses
.include <bsd.prog.mk>

View File

@ -15,7 +15,7 @@ CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
SUBDIR+=doc
DPADD+= ${LIBGNUREGEX}
LDADD+= -lgnuregex
DPADD= ${LIBGNUREGEX}
LDADD= -lgnuregex
.include <bsd.prog.mk>

View File

@ -11,10 +11,8 @@ LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
${BINDIR}/grep ${BINDIR}/fgrep
MLINKS= grep.1 egrep.1 grep.1 fgrep.1
DPADD+= ${LIBGNUREGEX}
DPADD+= ${LIBBZ2}
LDADD+= -lgnuregex
LDADD+= -lbz2
DPADD= ${LIBGNUREGEX} ${LIBBZ2}
LDADD= -lgnuregex -lbz2
LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
${BINDIR}/grep ${BINDIR}/bzegrep \

View File

@ -28,8 +28,8 @@ SHLIBDIR?= /lib
SRCS= atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c
INCS= libatm.h
LDADD+= -lmd
DPADD+= ${LIBMD}
LDADD= -lmd
DPADD= ${LIBMD}
WARNS?= 6
.include <bsd.lib.mk>

View File

@ -5,8 +5,8 @@ SHLIBDIR?= /lib
SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
INCS= camlib.h
DPADD+= ${LIBSBUF}
LDADD+= -lsbuf
DPADD= ${LIBSBUF}
LDADD= -lsbuf
MAN= cam.3 cam_cdbparse.3

View File

@ -7,8 +7,8 @@ SHLIB_MAJOR= 4
SRCS= devstat.c
INCS= devstat.h
DPADD+= ${LIBKVM}
LDADD+= -lkvm
DPADD= ${LIBKVM}
LDADD= -lkvm
MAN= devstat.3

View File

@ -26,8 +26,8 @@ CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \
ACCESSFILE?= \"/etc/opieaccess\"
CFLAGS+= -DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE}
LDADD+= -lmd
DPADD+= ${LIBMD}
LDADD= -lmd
DPADD= ${LIBMD}
MAN= ${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5

View File

@ -28,8 +28,8 @@ LIB= radius
SRCS= radlib.c
INCS= radlib.h radlib_vs.h
CFLAGS+= -Wall
DPADD+= ${LIBMD}
LDADD+= -lmd
DPADD= ${LIBMD}
LDADD= -lmd
SHLIB_MAJOR= 1
MAN= libradius.3 radius.conf.5

View File

@ -28,8 +28,8 @@ LIB= tacplus
SRCS= taclib.c
INCS= taclib.h
CFLAGS+= -Wall
DPADD+= ${LIBMD}
LDADD+= -lmd
DPADD= ${LIBMD}
LDADD= -lmd
SHLIB_MAJOR= 1
MAN= libtacplus.3 tacplus.conf.5

View File

@ -4,7 +4,7 @@
PROG= makekey
MAN= makekey.8
DPADD+= ${LIBCRYPT}
LDADD+= -lcrypt
DPADD= ${LIBCRYPT}
LDADD= -lcrypt
.include <bsd.prog.mk>

View File

@ -8,8 +8,8 @@ SRCS= fsdb.c fsdbutil.c \
dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
CFLAGS+= -I${.CURDIR}/../fsck_ffs
LDADD+= -ledit -ltermcap
DPADD+= ${LIBEDIT} ${LIBTERMCAP}
LDADD= -ledit -ltermcap
DPADD= ${LIBEDIT} ${LIBTERMCAP}
.PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
.include <bsd.prog.mk>

View File

@ -3,7 +3,7 @@
PROG= md5
LDADD+= -lmd
DPADD+= ${LIBMD}
LDADD= -lmd
DPADD= ${LIBMD}
.include <bsd.prog.mk>

View File

@ -5,8 +5,8 @@ PROG= rcorder
SRCS= ealloc.c hash.c rcorder.c
MAN= rcorder.8
LDADD+= -lutil
DPADD+= ${LIBUTIL}
LDADD= -lutil
DPADD= ${LIBUTIL}
WARNS= 0
# XXX hack for make's hash.[ch]

View File

@ -5,8 +5,8 @@ PROG= routed
SRCS= if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
MAN= routed.8
SUBDIR= rtquery
LDADD+= -lmd
DPADD+= ${LIBMD}
LDADD= -lmd
DPADD= ${LIBMD}
#COPTS= -g -DDEBUG -W -Wall -Wcast-align -Wcast-qual -Winline -Wpointer-arith -Wnested-externs -Wwrite-strings -Wunused
WARNS= 0

View File

@ -4,8 +4,8 @@
PROG= rtquery
MAN= rtquery.8
LDADD+= -lmd
DPADD+= ${LIBMD}
LDADD= -lmd
DPADD= ${LIBMD}
#COPTS= -g -DDEBUG -W -Wall -Wcast-align -Wcast-qual -Winline -Wpointer-arith -Wnested-externs -Wwrite-strings -Wunused
WARNS= 0

View File

@ -5,8 +5,8 @@ SRCS= sftp-common.c sftp-server.c
MAN= sftp-server.8
CFLAGS+=-I${SSHDIR}
DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD+= -lssh -lcrypt -lcrypto -lz
DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypt -lcrypto -lz
.include <bsd.prog.mk>

View File

@ -12,8 +12,8 @@ GENHDRS= aicasm_gram.h aicasm_macro_gram.h
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
DPADD+= ${LIBL}
LDADD+= -ll
DPADD= ${LIBL}
LDADD= -ll
# Correct path for kernel builds
# Don't rely on the kernel's .depend file

View File

@ -9,7 +9,7 @@ SRCS= common.c sscop_main.c
WARNS?= 6
CFLAGS+= -I${CONTRIB}
DPADD+= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
LDADD+= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
DPADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
LDADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
.include <bsd.prog.mk>

View File

@ -23,8 +23,9 @@ EXEMODE= ${NOBINMODE}
.if !defined(NO_X) && exists(${XINCDIR}/X11/X.h) && exists(${XLIBDIR}/libX11.a)
CFLAGS+= -I${XINCDIR}
LDADD+= -L${XLIBDIR} -lX11
DPADD+= ${XLIBDIR}/libX11.a
LDFLAGS= -L${XLIBDIR}
LDADD= -lX11
DPADD= ${XLIBDIR}/libX11.a
.else
CFLAGS+= -DNO_X
.endif

View File

@ -5,7 +5,7 @@ PROG= enigma
LINKS= ${BINDIR}/enigma ${BINDIR}/crypt
MLINKS= enigma.1 crypt.1
DPADD+= ${LIBCRYPT}
LDADD+= -lcrypt
DPADD= ${LIBCRYPT}
LDADD= -lcrypt
.include <bsd.prog.mk>

View File

@ -33,8 +33,8 @@ MAGICPATH= /usr/share/misc
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR} -I${SRCDIR}
LDADD+= -lz
DPADD+= ${LIBZ}
LDADD= -lz
DPADD= ${LIBZ}
CLEANFILES+= magic magic.mgc magic.mime.mgc magic.mime.PITA

View File

@ -14,8 +14,8 @@ SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c progressbar.c \
ruserpass.c util.c
CFLAGS+=-I${.CURDIR} -I${LUKEMFTP} -DINET6
LDADD+= -ledit -ltermcap -lutil
DPADD+= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
LDADD= -ledit -ltermcap -lutil
DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
LINKS= ${BINDIR}/ftp ${BINDIR}/pftp \
${BINDIR}/ftp ${BINDIR}/gate-ftp

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ipcs
DPADD+= ${LIBKVM}
LDADD+= -lkvm
DPADD= ${LIBKVM}
LDADD= -lkvm
.include <bsd.prog.mk>

View File

@ -1,8 +1,8 @@
# $FreeBSD$
PROG= minigzip
LDADD+= -lz
DPADD+= ${LIBZ}
LDADD= -lz
DPADD= ${LIBZ}
.PATH: ${.CURDIR}/../../lib/libz
.include <bsd.prog.mk>

View File

@ -3,8 +3,8 @@
PROG= ncal
SRCS= ncal.c
DPADD+= ${LIBCALENDAR}
LDADD+= -lcalendar
DPADD= ${LIBCALENDAR}
LDADD= -lcalendar
LINKS= ${BINDIR}/ncal ${BINDIR}/cal
MLINKS= ncal.1 cal.1

View File

@ -4,7 +4,7 @@
PROG= usbhidaction
SRCS= usbhidaction.c
LDADD+= -lusbhid
DPADD+= ${LIBUSBHID}
LDADD= -lusbhid
DPADD= ${LIBUSBHID}
.include <bsd.prog.mk>

View File

@ -40,8 +40,8 @@ PLLINKS= pl_PL
CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/include
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
DPADD= ${LIBNCURSES}
LDADD= -lncurses
CLEANFILES+=${EX}

View File

@ -7,8 +7,8 @@ SRCS= cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
MAN= lint.7
CLEANFILES= lint.7
LDADD+= -ll -lm
DPADD+= ${LIBL} ${LIBM}
LDADD= -ll -lm
DPADD= ${LIBL} ${LIBM}
CFLAGS+= -I. -I${.CURDIR}
LINTFLAGS=-aehpz

View File

@ -9,8 +9,8 @@ MOUNTDIR= ${.CURDIR}/../../sbin/mount
CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include
LDADD+= -lsmb
DPADD+= ${LIBSMB}
LDADD= -lsmb
DPADD= ${LIBSMB}
# Needs to be dynamically linked for optional dlopen() access to
# userland libiconv (see the -E option).

View File

@ -13,7 +13,7 @@ CFLAGS+= -DPC98
.endif
.if ${MACHINE_ARCH} == "alpha"
LDADD+= -lio
LDADD= -lio
DPADD= ${LIBIO}
.endif

View File

@ -7,8 +7,8 @@ PROG= syslogd
MAN= syslog.conf.5 syslogd.8
SRCS= syslogd.c ttymsg.c
DPADD+= ${LIBUTIL}
LDADD+= -lutil
DPADD= ${LIBUTIL}
LDADD= -lutil
WARNS?= 1
CFLAGS+=-DINET6 -I${.CURDIR}/../../usr.bin/wall