summaryrefslogtreecommitdiffstats
path: root/usr.bin/xlint/llib
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2002-03-03 15:12:50 +0000
committermarkm <markm@FreeBSD.org>2002-03-03 15:12:50 +0000
commit8207872db749971894f9cbcb5baf92b0defdc929 (patch)
treefbbab8c077a40ec926aa302ea9349a790feb7896 /usr.bin/xlint/llib
parent7d6830b3056aeb8b595f7f1d2b8afb86a365778d (diff)
downloadFreeBSD-src-8207872db749971894f9cbcb5baf92b0defdc929.zip
FreeBSD-src-8207872db749971894f9cbcb5baf92b0defdc929.tar.gz
Merge conflicts, fix Makefiles and remove (re)moved file(s).
Diffstat (limited to 'usr.bin/xlint/llib')
-rw-r--r--usr.bin/xlint/llib/Makefile15
-rw-r--r--usr.bin/xlint/llib/llib-lstdc2
2 files changed, 10 insertions, 7 deletions
diff --git a/usr.bin/xlint/llib/Makefile b/usr.bin/xlint/llib/Makefile
index 2c569f5..7a8c3b9 100644
--- a/usr.bin/xlint/llib/Makefile
+++ b/usr.bin/xlint/llib/Makefile
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.2 1995/07/03 21:25:05 cgd Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/14 20:22:19 matt Exp $
# $FreeBSD$
+.include <bsd.own.mk>
+
LIBS= llib-lposix.ln llib-lstdc.ln
LINT= ${.OBJDIR}/../xlint/xlint
-all: ${LIBS}
+.if ${MKLINT} != "no"
+FILES= ${LIBS}
+FILESDIR= ${LINTLIBDIR}
install:
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${LIBMODE} \
${LIBS} ${DESTDIR}${LINTLIBDIR}
-clean cleanall:
- rm -f ${LIBS}
+CLEANFILES+= ${LIBS}
llib-lposix.ln: llib-lposix
- ${LINT} -Cposix ${.ALLSRC}
+ ${LINT} ${LINTFLAGS} -Cposix ${.ALLSRC}
llib-lstdc.ln: llib-lstdc
- ${LINT} -Cstdc ${.ALLSRC}
+ ${LINT} ${LINTFLAGS} -Cstdc ${.ALLSRC}
.include <bsd.prog.mk>
diff --git a/usr.bin/xlint/llib/llib-lstdc b/usr.bin/xlint/llib/llib-lstdc
index 5ad0ec3..83b44f2 100644
--- a/usr.bin/xlint/llib/llib-lstdc
+++ b/usr.bin/xlint/llib/llib-lstdc
@@ -1,4 +1,4 @@
-/* $NetBSD: llib-lstdc,v 1.3 1995/07/03 21:39:28 cgd Exp $ */
+/* $NetBSD: llib-lstdc,v 1.2 1995/07/03 21:25:11 cgd Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
OpenPOWER on IntegriCloud