d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved checkdpadd target to where it logically belongs.

Browse Source
This commit is contained in:
Ruslan Ermilov 2002-07-03 12:44:06 +00:00
parent badb7c1c6b
commit 6e02167b57
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
share/mk/bsd.dep.mk
View File

@ -150,3 +150,25 @@ cleandepend:
.endif
.endif
.endif
.if !target(checkdpadd) && (defined(DPADD) || defined(LDADD))
checkdpadd:
.if ${OBJFORMAT} != aout
@ldadd=`echo \`for lib in ${DPADD} ; do \
echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \
done \`` ; \
ldadd1=`echo ${LDADD}` ; \
if [ "$$ldadd" != "$$ldadd1" ] ; then \
echo ${.CURDIR} ; \
echo "DPADD -> $$ldadd" ; \
echo "LDADD -> $$ldadd1" ; \
fi
.else
@dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \
if [ "$$dpadd" != "${DPADD}" ] ; then \
echo ${.CURDIR} ; \
echo "LDADD -> $$dpadd" ; \
echo "DPADD = ${DPADD}" ; \
fi
.endif
.endif

25
share/mk/bsd.obj.mk
View File

@ -126,31 +126,6 @@ clean:
.endif
.endif
.if !target(checkdpadd)
checkdpadd:
.if (defined(DPADD) || defined(LDADD))
checkdpadd:
.if ${OBJFORMAT} != aout
@ldadd=`echo \`for lib in ${DPADD} ; do \
echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \
done \`` ; \
ldadd1=`echo ${LDADD}` ; \
if [ "$$ldadd" != "$$ldadd1" ] ; then \
echo ${.CURDIR} ; \
echo "DPADD -> $$ldadd" ; \
echo "LDADD -> $$ldadd1" ; \
fi
.else
@dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \
if [ "$$dpadd" != "${DPADD}" ] ; then \
echo ${.CURDIR} ; \
echo "LDADD -> $$dpadd" ; \
echo "DPADD = ${DPADD}" ; \
fi
.endif
.endif
.endif
cleandir: cleanobj
DISTRIBUTION?= base