From 2bcc0b737c995163b0f9bd6c6b9b9fd559718383 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 28 Jan 2005 17:01:54 +0000 Subject: [PATCH] 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. --- lib/libmagic/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index f1f705a416ab..7659fe65cc0d 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