diff options
| author | gjb <gjb@FreeBSD.org> | 2016-01-04 19:19:48 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-01-04 19:19:48 +0000 |
| commit | ccde53b74b7bd32198439bfa247743fbf4c91a76 (patch) | |
| tree | 3882b41d5bbb0e4ad065fa3392bf2eab80a3d4e3 /secure/lib/libssh | |
| parent | 04942f20347330d49715904f537ca62d33372684 (diff) | |
| parent | c9ef17cbe9e3b753415472a271916c098cab7780 (diff) | |
| download | FreeBSD-src-ccde53b74b7bd32198439bfa247743fbf4c91a76.zip FreeBSD-src-ccde53b74b7bd32198439bfa247743fbf4c91a76.tar.gz | |
MFH r289384-r293170
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'secure/lib/libssh')
| -rw-r--r-- | secure/lib/libssh/Makefile | 11 | ||||
| -rw-r--r-- | secure/lib/libssh/Makefile.depend | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 624a6e0..d8b9afa 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -39,13 +39,11 @@ LIBADD+= ldns .endif CFLAGS+= -I${SSHDIR} -include ssh_namespace.h +SRCS+= ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -.endif - -.if ${MK_OPENSSH_NONE_CIPHER} != "no" -CFLAGS+= -DNONE_CIPHER_ENABLED +SRCS+= krb5_config.h .endif NO_LINT= @@ -55,8 +53,3 @@ LIBADD+= crypto crypt z .include <bsd.lib.mk> .PATH: ${SSHDIR} ${SSHDIR}/openbsd-compat - -${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h -.if ${MK_KERBEROS_SUPPORT} != "no" -${OBJS} ${POBJS} ${SOBJS}: krb5_config.h -.endif diff --git a/secure/lib/libssh/Makefile.depend b/secure/lib/libssh/Makefile.depend index fbf95e5..51e45b4 100644 --- a/secure/lib/libssh/Makefile.depend +++ b/secure/lib/libssh/Makefile.depend @@ -17,7 +17,6 @@ DIRDEPS = \ lib/libz \ secure/lib/libcrypto \ secure/lib/libssl \ - usr.bin/xinstall.host \ .include <dirdeps.mk> |
