summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/mtree/4.4BSD.dist7
-rw-r--r--share/mk/bsd.README16
-rw-r--r--share/mk/bsd.lib.mk25
-rw-r--r--share/mk/bsd.lkm.mk12
-rw-r--r--share/mk/bsd.own.mk5
-rw-r--r--share/mk/bsd.prog.mk14
-rw-r--r--share/mk/bsd.subdir.mk4
-rw-r--r--share/mk/bsd.sys.mk12
-rw-r--r--share/mk/sys.mk19
-rw-r--r--usr.bin/Makefile4
10 files changed, 22 insertions, 96 deletions
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 2c1c1315465..3aec39f34e1 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.221 2012/02/19 11:34:36 robert Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.222 2012/04/08 15:56:28 jsg Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -402,11 +402,6 @@ pkgconfig gname=bin uname=root mode=0755
# ./usr/libdata
libdata
-# ./usr/libdata/lint
-lint
-# ./usr/libdata/lint
-..
-
# ./usr/libdata/perl5
perl5
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 121bf5a4499..d4c5e5b34f2 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.README,v 1.46 2011/09/24 07:26:01 espie Exp $
+# $OpenBSD: bsd.README,v 1.47 2012/04/08 15:56:28 jsg Exp $
# $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
# @(#)bsd.README 5.1 (Berkeley) 5/11/90
@@ -176,8 +176,6 @@ MANMODE Manual mode. [${NONBINMODE}]
LIBDIR Base path for library installation. [/usr/lib]
-LINTLIBDIR Base path for lint(1) library installation. [/usr/libdata/lint]
-
LIBGRP Library group. [${BINGRP}]
LIBOWN Library owner. [${BINOWN}]
@@ -237,8 +235,6 @@ NOPROFILE Do not build profiled versions of system libraries.
NOPIC Do not build PIC versions of system libraries, and
do not build shared libraries.
-WANTLINT Build lint libraries.
-
DEBUG Add -g to assembly, C compiler and linking passes. Also
doesn't set STRIP to -s per default if defined.
@@ -294,8 +290,6 @@ It has eight targets:
beforeinstall and afterinstall may also be used to cause
actions immediately before and after the install target
is executed.
- lint:
- run lint on the source files
tags:
create a tags file for the source files.
@@ -420,7 +414,7 @@ If foo has multiple source files, add the line:
The include file <bsd.subdir.mk> contains the default targets for building
subdirectories. It has the same eight targets as <bsd.prog.mk>: all,
-clean, cleandir, depend, includes, install, lint, and tags. For all of
+clean, cleandir, depend, includes, install, and tags. For all of
the directories listed in the variable SUBDIR, the specified directory
will be visited and the target made. There is also a default target which
allows the command "make subdir" where subdir is any directory listed in
@@ -438,7 +432,7 @@ yacc that allow multiple lex and yacc targets to be built in parallel.
The include file <bsd.lib.mk> has support for building libraries. It has
the same eight targets as <bsd.prog.mk>: all, clean, cleandir, depend,
-includes, install, lint, and tags. It has a limited number of suffixes,
+includes, install, and tags. It has a limited number of suffixes,
consistent with the current needs of the BSD tree.
It sets/uses the following variables:
@@ -447,8 +441,6 @@ LIB The name of the library to build.
LIBDIR Target directory for libraries.
-LINTLIBDIR Target directory for lint libraries.
-
LIBGRP Library group.
LIBOWN Library owner.
@@ -476,7 +468,7 @@ Libraries are ranlib'd when made.
The include file <bsd.lkm.mk> has support for building the LKM's. It has
the same seven targets as <bsd.prog.mk>: all, clean, cleandir, depend,
-install, lint, and tags. In addition two targets are made available
+install, and tags. In addition two targets are made available
that is specific to the LKM's: load, unload.
It sets/uses the following variables (in addition to the <bsd.prog.mk>'s):
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index cad251b069a..48c97cd5d82 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.lib.mk,v 1.61 2011/07/16 23:34:21 guenther Exp $
+# $OpenBSD: bsd.lib.mk,v 1.62 2012/04/08 15:56:28 jsg Exp $
# $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
@@ -22,10 +22,10 @@ SHLIB_MINOR=${minor}
.MAIN: all
# prefer .S to a .c, add .po, remove stuff not used in the BSD libraries.
-# .so used for PIC object files. .ln used for lint output files.
+# .so used for PIC object files.
# .m for objective c files.
.SUFFIXES:
-.SUFFIXES: .out .o .go .po .so .S .s .c .cc .C .cxx .f .y .l .ln .m4 .m
+.SUFFIXES: .out .o .go .po .so .S .s .c .cc .C .cxx .f .y .l .m4 .m
.c.o:
@echo "${COMPILE.c} ${.IMPSRC} -o ${.TARGET}"
@@ -51,9 +51,6 @@ SHLIB_MINOR=${minor}
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-.c.ln:
- ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
-
.cc.o .C.o .cxx.o:
@echo "${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}"
@${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o
@@ -168,10 +165,6 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
.endif
.endif
-.if defined(WANTLINT) && ${WANTLINT:L} != "no"
-_LIBS+=llib-l${LIB}.ln
-.endif
-
all: ${_LIBS} _SUBDIRUSE
OBJS+= ${SRCS:N*.h:R:S/$/.o/}
@@ -210,13 +203,6 @@ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOBJS} ${DPADD}
-o lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
`${LORDER} ${SOBJS}|tsort -q` ${LDADD}
-LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
-LLIBS?= -lc
-llib-l${LIB}.ln: ${LOBJS}
- @echo building llib-l${LIB}.ln
- @rm -f llib-l${LIB}.ln
- @${LINT} -C${LIB} ${LOBJS} ${LLIBS}
-
.if !target(clean)
clean: _SUBDIRUSE
rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES}
@@ -224,7 +210,6 @@ clean: _SUBDIRUSE
rm -f lib${LIB}_g.a ${GOBJS}
rm -f lib${LIB}_p.a ${POBJS}
rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${SOBJS}
- rm -f llib-l${LIB}.ln ${LOBJS}
.endif
cleandir: _SUBDIRUSE clean
@@ -285,10 +270,6 @@ realinstall:
${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}
.endif
-.if defined(WANTLINT) && ${WANTLINT:L} != "no"
- ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
-.endif
.if defined(LINKS) && !empty(LINKS)
. for lnk file in ${LINKS}
@l=${DESTDIR}${lnk}; \
diff --git a/share/mk/bsd.lkm.mk b/share/mk/bsd.lkm.mk
index fc64ad21e58..6a07f8f1e4d 100644
--- a/share/mk/bsd.lkm.mk
+++ b/share/mk/bsd.lkm.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.lkm.mk,v 1.22 2011/07/16 23:34:21 guenther Exp $
+# $OpenBSD: bsd.lkm.mk,v 1.23 2012/04/08 15:56:28 jsg Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@@ -29,7 +29,6 @@ LDFLAGS+= -r
SRCS?= ${LKM}.c
.if !empty(SRCS:N*.h:N*.sh)
OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/}
-LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
.endif
COMBINED?=combined.o
.if !defined(POSTINSTALL)
@@ -54,7 +53,7 @@ all: ${COMBINED} _SUBDIRUSE
.if !target(clean)
clean: _SUBDIRUSE
rm -f a.out [Ee]rrs mklog core *.core \
- ${LKM} ${COMBINED} ${OBJS} ${LOBJS} ${CLEANFILES}
+ ${LKM} ${COMBINED} ${OBJS} ${CLEANFILES}
.endif
cleandir: _SUBDIRUSE clean
@@ -106,13 +105,6 @@ afterinstall: realinstall
realinstall: beforeinstall
.endif
-.if !target(lint)
-lint: ${LOBJS}
-.if defined(LOBJS) && !empty(LOBJS)
- @${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
-.endif
-.endif
-
.if !defined(NOMAN)
.include <bsd.man.mk>
.endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 0777c315db7..b5c07d5dfe1 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.114 2011/11/25 05:25:25 miod Exp $
+# $OpenBSD: bsd.own.mk,v 1.115 2012/04/08 15:56:28 jsg Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -76,7 +76,6 @@ MANOWN?= root
MANMODE?= ${NONBINMODE}
LIBDIR?= /usr/lib
-LINTLIBDIR?= /usr/libdata/lint
LIBGRP?= ${BINGRP}
LIBOWN?= ${BINOWN}
LIBMODE?= ${NONBINMODE}
@@ -154,5 +153,5 @@ BSD_OWN_MK=Done
.PHONY: spell clean cleandir obj manpages print all \
depend beforedepend afterdepend cleandepend subdirdepend \
- all lint cleanman nlsinstall cleannls includes \
+ all cleanman nlsinstall cleannls includes \
beforeinstall realinstall maninstall afterinstall install
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 03fc2969e4c..c17a5bf2583 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.prog.mk,v 1.52 2011/07/18 06:40:18 guenther Exp $
+# $OpenBSD: bsd.prog.mk,v 1.53 2012/04/08 15:56:28 jsg Exp $
# $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
@@ -8,7 +8,7 @@
.include <bsd.own.mk>
-.SUFFIXES: .out .ln .o .c .cc .C .cxx .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
+.SUFFIXES: .out .o .c .cc .C .cxx .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
.if ${WARNINGS:L} == "yes"
CFLAGS+= ${CDIAGFLAGS}
@@ -78,7 +78,6 @@ SRCS?= ${PROG}.c
OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/}
_LEXINTM+=${SRCS:M*.l:.l=.c}
_YACCINTM+=${SRCS:M*.y:.y=.c}
-LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} ${SRCS:M*.y:.y=.ln} ${SRCS:M*.l:.l=.ln}
. endif
. if defined(OBJS) && !empty(OBJS)
@@ -102,7 +101,7 @@ all: ${PROG} _SUBDIRUSE
.if !target(clean)
clean: _SUBDIRUSE
rm -f a.out [Ee]rrs mklog core *.core y.tab.h \
- ${PROG} ${OBJS} ${LOBJS} ${_LEXINTM} ${_YACCINTM} ${CLEANFILES}
+ ${PROG} ${OBJS} ${_LEXINTM} ${_YACCINTM} ${CLEANFILES}
.endif
cleandir: _SUBDIRUSE clean
@@ -139,13 +138,6 @@ afterinstall: realinstall
realinstall: beforeinstall
.endif
-.if !target(lint)
-lint: ${LOBJS}
-.if defined(LOBJS) && !empty(LOBJS)
- @${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
-.endif
-.endif
-
.if !defined(NOMAN)
.include <bsd.man.mk>
.endif
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 14066d418a3..e0a40208663 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.subdir.mk,v 1.16 2009/09/23 20:30:20 matthieu Exp $
+# $OpenBSD: bsd.subdir.mk,v 1.17 2012/04/08 15:56:28 jsg Exp $
# $NetBSD: bsd.subdir.mk,v 1.11 1996/04/04 02:05:06 jtc Exp $
# @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
@@ -76,7 +76,7 @@ realinstall: beforeinstall _SUBDIRUSE
.endif
-.for t in all clean cleandir includes depend lint obj tags regress
+.for t in all clean cleandir includes depend obj tags regress
. if !target($t)
$t: _SUBDIRUSE
. endif
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 1e6bc19cf55..7fd2d00185c 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.sys.mk,v 1.9 2006/05/27 23:01:21 deraadt Exp $
+# $OpenBSD: bsd.sys.mk,v 1.10 2012/04/08 15:56:28 jsg Exp $
# $NetBSD: bsd.sys.mk,v 1.2 1995/12/13 01:25:07 cgd Exp $
#
# Overrides used for OpenBSD source tree builds.
@@ -22,11 +22,6 @@ CXXFLAGS+= -idirafter ${DESTDIR}/usr/include/g++
${LEX.l} -o${.TARGET:R}.yy.c ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.yy.c
rm -f ${.TARGET:R}.yy.c
-.l.ln:
- ${LEX.l} ${.IMPSRC}
- mv lex.yy.c ${.TARGET:R}.c
- ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} -i ${.TARGET:R}.c
- rm -f ${.TARGET:R}.c
# Yacc
.y:
@@ -40,9 +35,4 @@ CXXFLAGS+= -idirafter ${DESTDIR}/usr/include/g++
${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.tab.c
rm -f ${.TARGET:R}.tab.c
-.y.ln:
- ${YACC.y} ${.IMPSRC}
- mv y.tab.c ${.TARGET:R}.c
- ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${.TARGET:R}.c
- rm -f ${.TARGET:R}.c
.endif
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 4f481017174..810167f37ba 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: sys.mk,v 1.62 2012/01/11 22:11:34 deraadt Exp $
+# $OpenBSD: sys.mk,v 1.63 2012/04/08 15:56:28 jsg Exp $
# $NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
# @(#)sys.mk 5.11 (Berkeley) 3/13/91
@@ -14,7 +14,7 @@ OSMINOR= 1
OSREV= $(OSMAJOR).$(OSMINOR)
OSrev= $(OSMAJOR)$(OSMINOR)
-.SUFFIXES: .out .a .ln .o .c .cc .C .cxx .F .f .r .y .l .s .S .cl .p .h .sh .m4
+.SUFFIXES: .out .a .o .c .cc .C .cxx .F .f .r .y .l .s .S .cl .p .h .sh .m4
.LIBS: .a
@@ -65,9 +65,6 @@ LEX.l?= ${LEX} ${LFLAGS}
LD?= ld
LDFLAGS+= ${DEBUG}
-LINT?= lint
-LINTFLAGS?= -hx
-
MAKE?= make
PC?= pc
@@ -94,8 +91,6 @@ CTAGS?= /usr/bin/ctags
${COMPILE.c} ${.IMPSRC}
${AR} ${ARFLAGS} $@ $*.o
rm -f $*.o
-.c.ln:
- ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
# C++
.cc:
@@ -193,11 +188,6 @@ CTAGS?= /usr/bin/ctags
${LEX.l} ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} lex.yy.c
rm -f lex.yy.c
-.l.ln:
- ${LEX.l} ${.IMPSRC}
- mv lex.yy.c ${.TARGET:R}.c
- ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} ${CPPFLAGS:M-[IDU]*} -i ${.TARGET:R}.c
- rm -f ${.TARGET:R}.c
# Yacc
.y:
@@ -211,11 +201,6 @@ CTAGS?= /usr/bin/ctags
${YACC.y} ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} y.tab.c
rm -f y.tab.c
-.y.ln:
- ${YACC.y} ${.IMPSRC}
- mv y.tab.c ${.TARGET:R}.c
- ${LINT} ${LINTFLAGS} ${CFLAGS:M-[IDU]*} ${CPPFLAGS:M-[IDU]*} -i ${.TARGET:R}.c
- rm -f ${.TARGET:R}.c
# Shell
.sh:
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 9046c651332..1516c3df538 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.121 2012/01/16 08:42:38 schwarze Exp $
+# $OpenBSD: Makefile,v 1.122 2012/04/08 15:56:28 jsg Exp $
.include <bsd.own.mk>
@@ -25,7 +25,7 @@ SUBDIR= apply apropos ar arch asa asn1_compile at aucat audioctl awk banner \
tmux top touch tput tr true tset tsort tty usbhidaction usbhidctl \
ul uname unexpand unifdef uniq units \
unvis users uudecode uuencode vacation vi vis vmstat w wall wc \
- what whatis which who whois write x99token xargs xinstall xlint \
+ what whatis which who whois write x99token xargs xinstall \
xstr yacc yes
.if (${YP:L} == "yes")
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 13:50:03 +0000