Index: head/bin/csh/Makefile =================================================================== --- head/bin/csh/Makefile (revision 275027) +++ head/bin/csh/Makefile (revision 275028) @@ -1,151 +1,150 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria # # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile. .include TCSHDIR= ${.CURDIR}/../../contrib/tcsh .PATH: ${TCSHDIR} PROG= csh .if defined(RESCUE) DFLAGS= -D_PATH_TCSHELL='"/rescue/${PROG}"' .else DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' .endif CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} WARNS?= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.h SRCS+= sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h SRCS+= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \ tw.comp.c tw.color.c SRCS+= ed.chared.c ed.decls.h ed.defns.c ed.h ed.init.c ed.inputl.c \ ed.refresh.c ed.screen.c ed.xmap.c ed.term.c ed.term.h SRCS+= tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \ tc.func.c tc.nls.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \ tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \ tc.who.c tc.h GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c SRCS+= ${GENHDRS} MLINKS= csh.1 tcsh.1 # MLINKS for Shell built in commands for which there are no userland # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh CLEANFILES= ${GENHDRS} gethost csh.1 .if ${MK_EXAMPLES} != "no" FILESDIR= ${SHAREDIR}/examples/tcsh FILES= complete.tcsh csh-mode.el .endif CATALOGS= et:et_EE.ISO8859-15 \ finnish:fi_FI.ISO8859-1 \ french:fr_FR.ISO8859-1 \ german:de_DE.ISO8859-1 \ greek:el_GR.ISO8859-7 \ italian:it_IT.ISO8859-1 \ ja:ja_JP.eucJP \ russian:ru_RU.KOI8-R \ spanish:es_ES.ISO8859-1 \ ukrainian:uk_UA.KOI8-U NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15 NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \ fr_CH.ISO8859-15 fr_FR.ISO8859-15 NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ de_CH.ISO8859-15 de_DE.ISO8859-15 NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 .if ${MK_NLS_CATALOGS} == "no" || defined(RESCUE) CFLAGS+= -DNO_NLS_CATALOGS .else CFLAGS+= -DHAVE_ICONV .if ${MK_ICONV} != "no" NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 .else # Above links can be installed from ports/shells/tcsh_nls GENHDRS+= iconv.h SRCS+= iconv_stub.c iconv.h: ${.CURDIR}/iconv_stub.h cp -f ${.CURDIR}/iconv_stub.h ${.TARGET} .endif .endif NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man cat ${.ALLSRC} > ${.TARGET} build-tools: gethost gethost: gethost.c sh.err.h tc.const.h sh.h @rm -f ${.TARGET} ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ ${TCSHDIR}/gethost.c tc.defs.c: gethost ${TCSHDIR}/host.defs @rm -f ${.TARGET} @echo "/* Do not edit this file, make creates it */" > ${.TARGET} ./gethost ${TCSHDIR}/host.defs >> ${.TARGET} ed.defns.h: ed.defns.c @rm -f ${.TARGET} @echo '/* Do not edit this file, make creates it. */' > ${.TARGET} @echo '#ifndef _h_ed_defns' >> ${.TARGET} @echo '#define _h_ed_defns' >> ${.TARGET} grep '[FV]_' ${TCSHDIR}/ed.defns.c | grep '^#define' >> ${.TARGET} @echo '#endif /* _h_ed_defns */' >> ${.TARGET} sh.err.h: sh.err.c @rm -f ${.TARGET} @echo '/* Do not edit this file, make creates it. */' > ${.TARGET} @echo '#ifndef _h_sh_err' >> ${.TARGET} @echo '#define _h_sh_err' >> ${.TARGET} grep 'ERR_' ${.ALLSRC} | grep '^#define' >> ${.TARGET} @echo '#endif /* _h_sh_err */' >> ${.TARGET} tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h @rm -f ${.TARGET} @echo '/* Do not edit this file, make creates it. */' > ${.TARGET} @echo '#ifndef _h_tc_const' >> ${.TARGET} @echo '#define _h_tc_const' >> ${.TARGET} ${CC} -E ${CFLAGS:C/-DHAVE_ICONV//} ${.ALLSRC} -D_h_tc_const | \ grep 'Char STR' | \ sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ sort >> ${.TARGET} @echo '#endif /* _h_tc_const */' >> ${.TARGET} .include Index: head/bin/df/Makefile =================================================================== --- head/bin/df/Makefile (revision 275027) +++ head/bin/df/Makefile (revision 275028) @@ -1,15 +1,14 @@ # @(#)Makefile 8.3 (Berkeley) 5/8/95 # $FreeBSD$ MOUNT= ${.CURDIR}/../../sbin/mount .PATH: ${MOUNT} PROG= df SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} ${LIBXO} -LDADD= -lutil -lxo +LIBADD= xo util .include Index: head/bin/ed/Makefile =================================================================== --- head/bin/ed/Makefile (revision 275027) +++ head/bin/ed/Makefile (revision 275028) @@ -1,16 +1,15 @@ # $FreeBSD$ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include Index: head/bin/ls/Makefile =================================================================== --- head/bin/ls/Makefile (revision 275027) +++ head/bin/ls/Makefile (revision 275028) @@ -1,18 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 # $FreeBSD$ .include PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAPW} -LDADD+= -ltermcapw +LIBADD+= termcapw .endif .include Index: head/bin/pkill/Makefile =================================================================== --- head/bin/pkill/Makefile (revision 275027) +++ head/bin/pkill/Makefile (revision 275028) @@ -1,26 +1,25 @@ # $NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $ # $FreeBSD$ .include PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 # # If considering retirement of these compatibility symlinks, # keep in mind that pkill is installed to /usr/bin in other # OS types, e.g., NetBSD, OpenBSD, Solaris, and Linux. # SYMLINKS= ${BINDIR}/pkill /usr/bin/pkill SYMLINKS+= ${BINDIR}/pgrep /usr/bin/pgrep .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/bin/ps/Makefile =================================================================== --- head/bin/ps/Makefile (revision 275027) +++ head/bin/ps/Makefile (revision 275028) @@ -1,17 +1,16 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c # # To support "lazy" ps for non root/wheel users # add -DLAZY_PS to the cflags. This helps # keep ps from being an unnecessary load # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include Index: head/bin/rmail/Makefile =================================================================== --- head/bin/rmail/Makefile (revision 275027) +++ head/bin/rmail/Makefile (revision 275028) @@ -1,39 +1,35 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail # Not much point this being static. It calls a shared sendmail... NO_SHARED?= NO PROG= rmail SRCS= rmail.c MAN= rmail.8 WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} # If you want to have your rmail queuing the mail only, uncomment the # following: # CFLAGS+= -DQUEUE_ONLY sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: head/bin/sh/Makefile =================================================================== --- head/bin/sh/Makefile (revision 275027) +++ head/bin/sh/Makefile (revision 275028) @@ -1,68 +1,67 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ .include PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ exec.c expand.c \ histedit.c input.c jobs.c kill.c mail.c main.c memalloc.c miscbltin.c \ mystring.c options.c output.c parser.c printf.c redir.c show.c \ test.c trap.c var.c GENSRCS= builtins.c nodes.c syntax.c GENHDRS= builtins.h nodes.h syntax.h token.h SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # MLINKS for Shell built in commands for which there are no userland # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # DEBUG_FLAGS+= -g -DDEBUG=2 -fno-inline WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ${.CURDIR}/../kill \ ${.CURDIR}/../test \ ${.CURDIR}/../../usr.bin/printf CLEANFILES+= mknodes mknodes.o \ mksyntax mksyntax.o CLEANFILES+= ${GENSRCS} ${GENHDRS} build-tools: mknodes mksyntax .ORDER: builtins.c builtins.h builtins.c builtins.h: mkbuiltins builtins.def sh ${.CURDIR}/mkbuiltins ${.CURDIR} # XXX this is just to stop the default .c rule being used, so that the # intermediate object has a fixed name. # XXX we have a default .c rule, but no default .o rule. .o: ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} mknodes: mknodes.o mksyntax: mksyntax.o .ORDER: nodes.c nodes.h nodes.c nodes.h: mknodes nodetypes nodes.c.pat ./mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat .ORDER: syntax.c syntax.h syntax.c syntax.h: mksyntax ./mksyntax token.h: mktokens sh ${.CURDIR}/mktokens .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include