Module Name: src Committed By: jmmv Date: Fri Aug 24 20:28:19 UTC 2012
Modified Files: src/share/mk: bsd.test.mk Log Message: Make DPADD and LDADD specific to the test programs. This allows mixing C and C++ test programs in the same Makefile, and prevents regular programs from being polluted by libraries that they may not need. Suggested by Garrett Cooper in private mail, although I redid his patch. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/mk/bsd.test.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.test.mk diff -u src/share/mk/bsd.test.mk:1.19 src/share/mk/bsd.test.mk:1.20 --- src/share/mk/bsd.test.mk:1.19 Sat Sep 10 16:57:35 2011 +++ src/share/mk/bsd.test.mk Fri Aug 24 20:28:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.test.mk,v 1.19 2011/09/10 16:57:35 apb Exp $ +# $NetBSD: bsd.test.mk,v 1.20 2012/08/24 20:28:19 jmmv Exp $ # .include <bsd.init.mk> @@ -15,10 +15,10 @@ _TESTS:= ${TESTS_SUBDIRS:N.WAIT} .if defined(TESTS_C) _TESTS+= ${TESTS_C} PROGS+= ${TESTS_C} -LDADD+= -latf-c -DPADD+= ${LIBATF_C} . for _T in ${TESTS_C} BINDIR.${_T}= ${TESTSDIR} +LDADD.${_T}+= -latf-c +DPADD.${_T}+= ${LIBATF_C} MAN.${_T}?= # empty . endfor .endif @@ -26,10 +26,10 @@ MAN.${_T}?= # empty .if defined(TESTS_CXX) _TESTS+= ${TESTS_CXX} PROGS_CXX+= ${TESTS_CXX} -LDADD+= -latf-c++ -latf-c -DPADD+= ${LIBATF_CXX} ${LIBATF_C} . for _T in ${TESTS_CXX} BINDIR.${_T}= ${TESTSDIR} +LDADD.${_T}+= -latf-c++ -latf-c +DPADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C} MAN.${_T}?= # empty . endfor .endif