diff options
Diffstat (limited to 'examples/subprojects')
| -rw-r--r-- | examples/subprojects/libhello1/linkme.mk | 6 | ||||
| -rw-r--r-- | examples/subprojects/libhello2/linkme.mk | 6 | ||||
| -rw-r--r-- | examples/subprojects/test.mk | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/examples/subprojects/libhello1/linkme.mk b/examples/subprojects/libhello1/linkme.mk index 731ac90..41a35b6 100644 --- a/examples/subprojects/libhello1/linkme.mk +++ b/examples/subprojects/libhello1/linkme.mk @@ -1,5 +1,5 @@ -PATH.hello1 := ${.PARSEDIR} +PATH.hello1 := ${.PARSEDIR:tA} -CPPFLAGS += -I${PATH.hello1} +DPINCDIRS += ${PATH.hello1} DPLIBDIRS += ${PATH.hello1} -LDADD0 += -lhello1 +DPLDADD += hello1 diff --git a/examples/subprojects/libhello2/linkme.mk b/examples/subprojects/libhello2/linkme.mk index 135ad9e..ca21bf6 100644 --- a/examples/subprojects/libhello2/linkme.mk +++ b/examples/subprojects/libhello2/linkme.mk @@ -1,5 +1,5 @@ -PATH.hello2 := ${.PARSEDIR} +PATH.hello2 := ${.PARSEDIR:tA} -CPPFLAGS += -I${PATH.hello2}/include +DPINCDIRS += ${PATH.hello2}/include DPLIBDIRS += ${PATH.hello2} -LDADD0 += -lhello2 +DPLDADD += hello2 diff --git a/examples/subprojects/test.mk b/examples/subprojects/test.mk index 46ac375..27b2071 100644 --- a/examples/subprojects/test.mk +++ b/examples/subprojects/test.mk @@ -9,8 +9,9 @@ test_output : rm -rf ${.OBJDIR}${PREFIX}; \ LD_LIBRARY_PATH=${.CURDIR}/libhello1:${.CURDIR}/libhello2:$$LD_LIBRARY_PATH; \ DYLD_LIBRARY_PATH=${.CURDIR}/libhello1:${.CURDIR}/libhello2:$$LD_LIBRARY_PATH; \ + LIBRARY_PATH=$$LIBRARY_PATH:$$LD_LIBRARY_PATH; \ MKINSTALLDIRS=no; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH; \ + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBRARY_PATH; \ ${.CURDIR}/hello/hello_subprojects; \ ${.CURDIR}/hello/hello_subprojects2; \ \ @@ -21,6 +22,7 @@ test_output : echo ===== all SHRTOUT=yes ======; \ ${MAKE} ${MAKEFLAGS} clean > /dev/null; \ ${MAKE} ${MAKEFLAGS} all SHRTOUT=YES 2>&1 | \ + grep -v warning: | \ mkc_test_helper_paths; \ \ echo ========= installdirs ==========; \ |