Module Name:    src
Committed By:   martin
Date:           Sun Apr  5 11:18:02 UTC 2020

Modified Files:
        src/distrib/utils/libhack: Makefile.inc

Log Message:
Extend the curses hack to terminfo - build selected parts of
libterminfo as part of libhack, so we can drop unwanted features
for small install media.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/libhack/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/libhack/Makefile.inc
diff -u src/distrib/utils/libhack/Makefile.inc:1.34 src/distrib/utils/libhack/Makefile.inc:1.35
--- src/distrib/utils/libhack/Makefile.inc:1.34	Mon Mar  2 16:01:52 2020
+++ src/distrib/utils/libhack/Makefile.inc	Sun Apr  5 11:18:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.34 2020/03/02 16:01:52 roy Exp $
+# $NetBSD: Makefile.inc,v 1.35 2020/04/05 11:18:02 martin Exp $
 #
 # Include this fragment to build libhack.o
 # It is .o and not .a to make sure these are the
@@ -41,6 +41,23 @@ CPPFLAGS.${s}+=	-DDISABLE_WCHAR -DSMALL 
 HACKOBJS+=	${s:S/.c/.o/}
 ${s:S/.c/.o/}:	${HACKSRC}/../../../lib/libcurses/${s}
 .endfor
+
+TERMINFO_SRC!=	cd ${HACKSRC}/../../../lib/libterminfo && \
+		${MAKE} SMALLPROG=1 -v SRCS
+TERMINFO_PATH!=	cd ${HACKSRC}/../../../lib/libterminfo && \
+		${MAKE} -v .OBJDIR
+
+.for s in ${TERMINFO_SRC}
+CPPFLAGS.${s}+=	-DDISABLE_WCHAR -DSMALL \
+		-I${HACKSRC}/../../../lib/libterminfo \
+		-I${TERMINFO_PATH}
+HACKOBJS+=	${s:S/.c/.o/}
+.if ${s:Mhash*} != ""
+${s:S/.c/.o/}:	${TERMINFO_PATH}/${s}
+.else
+${s:S/.c/.o/}:	${HACKSRC}/../../../lib/libterminfo/${s}
+.endif
+.endfor
 .endif
 
 CPPFLAGS.runetable.c+= -I${HACKSRC}/../../../lib/libc/citrus \

Reply via email to