[src/trunk]: src/lib/libterminfo Separate the generators out, so that they ca...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d8024d6f5f96
branches:  trunk
changeset: 770915:d8024d6f5f96
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Nov 02 17:48:53 2011 +0000

description:
Separate the generators out, so that they can be re-used by tools, and
don't play games with curdir/objdir.

diffstat:

 lib/libterminfo/Makefile      |  19 ++-----------------
 lib/libterminfo/Makefile.hash |  19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)

diffs (56 lines):

diff -r 0a18d06545e9 -r d8024d6f5f96 lib/libterminfo/Makefile
--- a/lib/libterminfo/Makefile  Wed Nov 02 16:54:50 2011 +0000
+++ b/lib/libterminfo/Makefile  Wed Nov 02 17:48:53 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2011/11/02 12:09:25 roy Exp $
+#      $NetBSD: Makefile,v 1.19 2011/11/02 17:48:53 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -37,22 +37,7 @@
 
 CPPFLAGS+=     -I${.OBJDIR}
 
-# Generate our string and hash tables
-hash.c: genhash term.h
-               @echo "Generating terminfo hash"
-               cd ${.CURDIR} && ${HOST_SH} ./genhash >${.OBJDIR}/$@
-
-termcap_hash.c: genthash term.h
-               @echo "Generating termcap hash"
-               cd ${.CURDIR} && ${HOST_SH} ./genthash >${.OBJDIR}/$@
-
-
-# Allow terminfo descriptions to be compiled into libterminfo
-compiled_terms.c: genterms term.h ${NETBSDSRCDIR}/share/terminfo/terminfo
-               @echo "Generating compiled terminfo descriptions"
-               cd ${.CURDIR} && ${HOST_SH} ./genterms >${.OBJDIR}/$@
-
-CLEANFILES+=   hash.c termcap_hash.c compiled_terms.c
+.include <Makefile.hash>
 
 term.c: compiled_terms.c
 
diff -r 0a18d06545e9 -r d8024d6f5f96 lib/libterminfo/Makefile.hash
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libterminfo/Makefile.hash     Wed Nov 02 17:48:53 2011 +0000
@@ -0,0 +1,19 @@
+#      $NetBSD: Makefile.hash,v 1.1 2011/11/02 17:48:53 christos Exp $
+
+PARSEDIR:=${.PARSEDIR}
+# Generate our string and hash tables
+hash.c: genhash term.h
+               @echo "Generating terminfo hash"
+               ${HOST_SH} ${.ALLSRC} > ${.TARGET}
+
+termcap_hash.c: genthash termcap_map.c
+               @echo "Generating termcap hash"
+               ${HOST_SH} ${.ALLSRC} > ${.TARGET}
+
+
+# Allow terminfo descriptions to be compiled into libterminfo
+compiled_terms.c: genterms term.h ${NETBSDSRCDIR}/share/terminfo/terminfo
+               @echo "Generating compiled terminfo descriptions"
+               ${HOST_SH} ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+=   hash.c termcap_hash.c compiled_terms.c