aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/Makefile1
-rw-r--r--gnu/usr.bin/diff3/Makefile22
-rw-r--r--gnu/usr.bin/diff3/Makefile.depend15
3 files changed, 0 insertions, 38 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index e12fc0ccc403..d5b127546c6f 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,7 +1,6 @@
.include <src.opts.mk>
SUBDIR.${MK_DIALOG}+= dialog
-SUBDIR.${MK_GNU_DIFF}+= diff3
SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL=
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
deleted file mode 100644
index 568733801a6b..000000000000
--- a/gnu/usr.bin/diff3/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-PACKAGE= diff3
-
-DIFFSRC=${SRCTOP}/contrib/diff/src
-.PATH: ${DIFFSRC} \
- ${SRCTOP}/contrib/diff/lib \
- ${SRCTOP}/contrib/diff/man
-PROG= diff3
-SRCS= diff3.c version-etc.c \
- xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c
-
-# Important for ctype macros!
-CFLAGS+=-funsigned-char
-
-CFLAGS+=-I${SRCTOP}/contrib/diff/
-CFLAGS+=-I${SRCTOP}/contrib/diff/src
-CFLAGS+=-I${SRCTOP}/contrib/diff/lib
-CFLAGS+=-DHAVE_CONFIG_H
-CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
-
-WARNS?= 0
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/diff3/Makefile.depend b/gnu/usr.bin/diff3/Makefile.depend
deleted file mode 100644
index 6ef78fac5cbf..000000000000
--- a/gnu/usr.bin/diff3/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif