summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2005-01-28 17:01:54 +0000
committerru <ru@FreeBSD.org>2005-01-28 17:01:54 +0000
commited7698639ed597bdc0efb774f651f36b4a223211 (patch)
treeed3ec1bed5c16fd246999440377501a31b146ce6 /lib
parent84fabcb71a04a62fbdc7418ce8c387336008b150 (diff)
downloadFreeBSD-src-ed7698639ed597bdc0efb774f651f36b4a223211.zip
FreeBSD-src-ed7698639ed597bdc0efb774f651f36b4a223211.tar.gz
Clean up makefile.
- Remove all:. It's redundant, and ${LIB} in it is just a bug. - Remove .ORDER:. *.mgc files can safely be built in parallel. - Remove PITA. The mkmagic tool is smart to put the binary file into the current directory (${.OBJDIR}) even if the source file lives somewhere else, which is just what we need.
Diffstat (limited to 'lib')
-rw-r--r--lib/libmagic/Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index f1f705a..7659fe6 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -17,7 +17,7 @@ MAGICPATH?= /usr/share/misc
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR} -I${CONTRDIR}
-CLEANFILES+= magic magic.mgc magic.mime.mgc magic.mime.PITA
+CLEANFILES+= magic magic.mgc magic.mime.mgc
FILES= magic magic.mgc ${CONTRDIR}/magic.mime magic.mime.mgc
FILESDIR= ${MAGICPATH}
@@ -26,9 +26,6 @@ MAGFILES= ${CONTRDIR}/Header\
${CONTRDIR}/Localstuff\
${CONTRDIR}/Magdir/[a-z]*
-.ORDER: ${LIB} magic.mgc magic.mime.mgc ${MAN}
-all: ${LIB} magic.mgc magic.mime.mgc ${MAN}
-
magic: ${MAGFILES}
cat ${.ALLSRC} > ${.TARGET}
@@ -36,9 +33,7 @@ magic.mgc: mkmagic magic
./mkmagic magic
magic.mime.mgc: mkmagic magic.mime
- ln -sf ${.ALLSRC:M*magic.mime*} magic.mime.PITA
- ./mkmagic magic.mime.PITA
- mv magic.mime.PITA.mgc magic.mime.mgc
+ ./mkmagic ${CONTRDIR}/magic.mime
CLEANFILES+= mkmagic
build-tools: mkmagic
OpenPOWER on IntegriCloud