Module Name: src
Committed By: christos
Date: Wed Nov 2 17:48:53 UTC 2011
Modified Files:
src/lib/libterminfo: Makefile
Added Files:
src/lib/libterminfo: Makefile.hash
Log Message:
Separate the generators out, so that they can be re-used by tools, and
don't play games with curdir/objdir.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libterminfo/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libterminfo/Makefile.hash
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/Makefile
diff -u src/lib/libterminfo/Makefile:1.18 src/lib/libterminfo/Makefile:1.19
--- src/lib/libterminfo/Makefile:1.18 Wed Nov 2 08:09:25 2011
+++ src/lib/libterminfo/Makefile Wed Nov 2 13:48:53 2011
@@ -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 @@ MLINKS+= termcap.3 tgetent.3 termcap.3 t
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
Added files:
Index: src/lib/libterminfo/Makefile.hash
diff -u /dev/null src/lib/libterminfo/Makefile.hash:1.1
--- /dev/null Wed Nov 2 13:48:53 2011
+++ src/lib/libterminfo/Makefile.hash Wed Nov 2 13:48:53 2011
@@ -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
