[src/trunk]: src/crypto/external/bsd/openssh Put the CPPFLAGS in a separate M...

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

details:   https://anonhg.NetBSD.org/src/rev/bf2d2e833f28
branches:  trunk
changeset: 750183:bf2d2e833f28
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 19 18:00:26 2009 +0000

description:
Put the CPPFLAGS in a separate Makefile.inc so that all the defines are
visible in the LIB build. Fixes problem with X11BASE and readpass.c

diffstat:

 crypto/external/bsd/openssh/Makefile.inc     |  32 +++++++++++++++++++++++++++
 crypto/external/bsd/openssh/bin/Makefile.inc |  33 +--------------------------
 2 files changed, 34 insertions(+), 31 deletions(-)

diffs (77 lines):

diff -r c776b26cc129 -r bf2d2e833f28 crypto/external/bsd/openssh/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssh/Makefile.inc  Sat Dec 19 18:00:26 2009 +0000
@@ -0,0 +1,32 @@
+#      $NetBSD: Makefile.inc,v 1.1 2009/12/19 18:00:26 christos Exp $
+
+WARNS?=        1       # XXX -Wshadow -Wcast-qual
+
+.include <bsd.own.mk>
+
+USE_FORT?= yes # network client/server
+
+SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
+
+CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
+.PATH: ${SSHDIST}
+
+.if (${USE_PAM} != "no")
+CPPFLAGS+=-DUSE_PAM
+.else  # USE_PAM == no
+.if (${USE_SKEY} != "no")
+CPPFLAGS+=-DSKEY
+.endif
+.endif # USE_PAM == no
+
+.if (${USE_KERBEROS} != "no")
+CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
+CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
+.endif
+
+.if ${X11FLAVOUR} == "Xorg"
+CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
+.endif
+
+CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
+CPPFLAGS+=-DLIBWRAP
diff -r c776b26cc129 -r bf2d2e833f28 crypto/external/bsd/openssh/bin/Makefile.inc
--- a/crypto/external/bsd/openssh/bin/Makefile.inc      Sat Dec 19 16:01:25 2009 +0000
+++ b/crypto/external/bsd/openssh/bin/Makefile.inc      Sat Dec 19 18:00:26 2009 +0000
@@ -1,35 +1,6 @@
-#      $NetBSD: Makefile.inc,v 1.1 2009/06/07 22:38:45 christos Exp $
-
-WARNS?=        1       # XXX -Wshadow -Wcast-qual
-
-.include <bsd.own.mk>
-
-USE_FORT?= yes # network client/server
-
-SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
-
-CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
-.PATH: ${SSHDIST}
+#      $NetBSD: Makefile.inc,v 1.2 2009/12/19 18:00:26 christos Exp $
 
 LDADD+=        -lssh -lcrypto -lcrypt -lz
 DPADD+=        ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
 
-.if (${USE_PAM} != "no")
-CPPFLAGS+=-DUSE_PAM
-.else  # USE_PAM == no
-.if (${USE_SKEY} != "no")
-CPPFLAGS+=-DSKEY
-.endif
-.endif # USE_PAM == no
-
-.if (${USE_KERBEROS} != "no")
-CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
-CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
-.endif
-
-.if ${X11FLAVOUR} == "Xorg"
-CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
-.endif
-
-CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
-CPPFLAGS+=-DLIBWRAP
+.include "${.PARSEDIR}/../Makefile.inc"