Module Name: src
Committed By: christos
Date: Sun Jun 7 22:59:23 UTC 2009
Modified Files:
src/compat: Makefile
src/compat/external/lib: Makefile
Added Files:
src/compat/crypto/external/bsd/openssh/lib: Makefile
Log Message:
glue in openssh
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/compat/external/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile
diff -u src/compat/Makefile:1.3 src/compat/Makefile:1.4
--- src/compat/Makefile:1.3 Tue Apr 14 13:51:57 2009
+++ src/compat/Makefile Sun Jun 7 18:59:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/14 17:51:57 christos Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/07 22:59:22 christos Exp $
# Build 32-bit compat versions of:
# src/gnu/lib/libgcc4 into ${DESTDIR}/usr/lib/<32arch>
@@ -20,6 +20,7 @@
lib/libutil .WAIT \
lib gnu/lib .WAIT \
external/lib .WAIT \
+ crypto/external/lib .WAIT \
libexec/ld.elf_so
.endif
Index: src/compat/external/lib/Makefile
diff -u src/compat/external/lib/Makefile:1.4 src/compat/external/lib/Makefile:1.5
--- src/compat/external/lib/Makefile:1.4 Fri May 8 13:54:22 2009
+++ src/compat/external/lib/Makefile Sun Jun 7 18:59:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/08 17:54:22 christos Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/07 22:59:22 christos Exp $
#
# This Makefile exists to provide a single point to build
@@ -8,17 +8,8 @@
.include <bsd.own.mk>
-.if (${MKATF} != "no")
-SUBDIR+= ../bsd/atf/lib
-.endif
-
.if (${MKCRYPTO} != "no")
-.if (${MKLDAP} != "no")
-SUBDIR+= ../bsd/openldap/lib
+SUBDIR+= ../bsd/openssh/lib
.endif
-.endif
-
-SUBDIR+= ../bsd/bind/lib
-SUBDIR+= ../bsd/file/lib
.include <bsd.subdir.mk>
Added files:
Index: src/compat/crypto/external/bsd/openssh/lib/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/openssh/lib/Makefile:1.1
--- /dev/null Sun Jun 7 18:59:23 2009
+++ src/compat/crypto/external/bsd/openssh/lib/Makefile Sun Jun 7 18:59:22 2009
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2009/06/07 22:59:22 christos Exp $
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= crypto ${.CURDIR}/../../../../../../lib/libcrypto \
+ crypt ${.CURDIR}/../../../../../../lib/libcrypt \
+ z ${.CURDIR}/../../../../../../lib/libz
+
+NOCHECKVER= # defined
+
+.include <bsd.obj.mk>
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:= ${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/openssh/lib
+.CURDIR:= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/lib
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:= ${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
