Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/utils/libhack Use .PATH because the newmake does not...



details:   https://anonhg.NetBSD.org/src/rev/cd0dc918bf2b
branches:  trunk
changeset: 801959:cd0dc918bf2b
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Aug 25 14:11:51 2014 +0000

description:
Use .PATH because the newmake does not apply pattern rules to sources in
other directories. Leave the comment and the old code for now so people
are aware that this might not work.

diffstat:

 distrib/utils/libhack/Makefile.inc |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r fc3fd64d2c37 -r cd0dc918bf2b distrib/utils/libhack/Makefile.inc
--- a/distrib/utils/libhack/Makefile.inc        Mon Aug 25 13:22:20 2014 +0000
+++ b/distrib/utils/libhack/Makefile.inc        Mon Aug 25 14:11:51 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.25 2013/08/27 09:53:33 christos Exp $
+# $NetBSD: Makefile.inc,v 1.26 2014/08/25 14:11:51 christos Exp $
 #
 # Include this fragment to build libhack.o
 # It is .o and not .a to make sure these are the
@@ -28,11 +28,13 @@
 CPPFLAGS.gethost.c+= -I${HACKSRC}/../../../lib/libc/net
 
 libhack.o: ${HACKOBJS}
-       ${LD} -r -o $@ ${HACKOBJS}
+       ${LD} -r -o $@ ${.ALLSRC}
 
 
+.if 1
+.PATH.c: ${HACKSRC} ${HACKSRC}/../../../lib/libc/gen ${HACKSRC}/../../../lib/libc/locale
+.else
 # XXX .PATH won't work here, because of crunchgen used by various builds
-
 getcap.o:      ${HACKSRC}/../../../lib/libc/gen/getcap.c
 getgrent.o:    ${HACKSRC}/getgrent.c
 gethost.o:     ${HACKSRC}/gethost.c
@@ -49,3 +51,4 @@
 syslog.o:      ${HACKSRC}/syslog.c
 utmp.o:                ${HACKSRC}/utmp.c
 yplib.o:       ${HACKSRC}/yplib.c
+.endif



Home | Main Index | Thread Index | Old Index