Date: Thu, 17 Jan 2013 17:07:55 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245558 - in projects/mtree: lib/libmagic share/mk Message-ID: <201301171707.r0HH7t1O021277@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Jan 17 17:07:54 2013 New Revision: 245558 URL: http://svnweb.freebsd.org/changeset/base/245558 Log: Simplify the implementation of LIBRARIES_ONLY. Modified: projects/mtree/lib/libmagic/Makefile projects/mtree/share/mk/bsd.lib.mk projects/mtree/share/mk/bsd.nls.mk Modified: projects/mtree/lib/libmagic/Makefile ============================================================================== --- projects/mtree/lib/libmagic/Makefile Thu Jan 17 17:05:54 2013 (r245557) +++ projects/mtree/lib/libmagic/Makefile Thu Jan 17 17:07:54 2013 (r245558) @@ -22,7 +22,6 @@ CFLAGS+= -I${.CURDIR} -I${CONTRDIR} WARNS?= 3 -.if !defined(LIBRARIES_ONLY) CLEANFILES+= magic magic.mgc FILES= magic magic.mgc @@ -53,6 +52,5 @@ ${mp}: ${mp:C/[0-9]/man/} -e 's/__VERSION__/${FILEVER}/g' \ -e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET} .endfor -.endif .include <bsd.lib.mk> Modified: projects/mtree/share/mk/bsd.lib.mk ============================================================================== --- projects/mtree/share/mk/bsd.lib.mk Thu Jan 17 17:05:54 2013 (r245557) +++ projects/mtree/share/mk/bsd.lib.mk Thu Jan 17 17:07:54 2013 (r245558) @@ -331,9 +331,12 @@ _libinstall: .endif .endif # !defined(INTERNALLIB) +.if !defined(LIBRARIES_ONLY) .include <bsd.nls.mk> .include <bsd.files.mk> .include <bsd.incs.mk> +.endif + .include <bsd.links.mk> .if ${MK_MAN} != "no" @@ -348,7 +351,7 @@ lint: ${SRCS:M*.c} ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) .include <bsd.man.mk> .endif Modified: projects/mtree/share/mk/bsd.nls.mk ============================================================================== --- projects/mtree/share/mk/bsd.nls.mk Thu Jan 17 17:05:54 2013 (r245557) +++ projects/mtree/share/mk/bsd.nls.mk Thu Jan 17 17:07:54 2013 (r245558) @@ -30,7 +30,7 @@ GENCAT?= gencat .msg.cat: ${GENCAT} ${.TARGET} ${.IMPSRC} -.if defined(NLS) && !empty(NLS) && ${MK_NLS} != "no" && !defined(LIBRARIES_ONLY) +.if defined(NLS) && !empty(NLS) && ${MK_NLS} != "no" # # .msg file pre-build rules
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301171707.r0HH7t1O021277>