summaryrefslogtreecommitdiffstats
path: root/security/ssh2/files/patch-aa
blob: 0bb60792b62b578184c29fbefcf4b05c3c0b1ffe (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
--- lib/Makefile.in.orig	Thu Mar 30 21:41:49 2000
+++ lib/Makefile.in	Wed May 17 18:03:14 2000
@@ -105,7 +105,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies
 
-SUBDIRS = sshutil zlib sshmath sshreadline sshapputil sshcrypt sshproto sshsession sshpgp sshfilexfer
+SUBDIRS = sshutil sshmath sshreadline sshapputil sshcrypt sshproto sshsession sshpgp sshfilexfer
 
 SUBDIRS_windelta = +win32
 
@@ -114,7 +114,7 @@
 # The `object_SUBLIBRARIES' variables are used on the Windows to
 # expand the original library `object' with the listed sublibraries at
 # the link step.
-libssh_a_SUBLIBRARIES =  	sshcert/libsshcert.a				sshcrypt/libsshcrypt.a				sshexternalkey/libsshexternalkey.a		sshhs/libsshhs.a				sshhttp/libsshhttp.a				sshipsecappapi/libsshipsecappapi.a		sshisakmp/libsshisakmp.a			sshldap/libsshldap.a				sshmath/libsshmath.a				sshpgp/libsshpgp.a				sshproto/libsshproto.a				sshscard/libsshscard.a				sshtls/libsshtls.a				sshsmtp/libsshsmtp.a				sshemul/libsshemul.a				sshutil/libsshutil.a				sshfilexfer/libsshfilexfer.a			sshsession/libsshsession.a			trq/libtrq.a					zlib/libz.a
+libssh_a_SUBLIBRARIES =  	sshcert/libsshcert.a				sshcrypt/libsshcrypt.a				sshexternalkey/libsshexternalkey.a		sshhs/libsshhs.a				sshhttp/libsshhttp.a				sshipsecappapi/libsshipsecappapi.a		sshisakmp/libsshisakmp.a			sshldap/libsshldap.a				sshmath/libsshmath.a				sshpgp/libsshpgp.a				sshproto/libsshproto.a				sshscard/libsshscard.a				sshtls/libsshtls.a				sshsmtp/libsshsmtp.a				sshemul/libsshemul.a				sshutil/libsshutil.a				sshfilexfer/libsshfilexfer.a			sshsession/libsshsession.a			trq/libtrq.a
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../sshconf.h
@@ -314,11 +314,6 @@
 
 local-includes:
 	-if test '!' -d ../include; then mkdir ../include; fi
-	for i in zlib/zlib.h zlib/zconf.h; do   \
-	  if test -f $(srcdir)/$$i; then		  \
-	    $(COPY_INCLUDE) $(srcdir)/$$i ../include;	  \
-	  fi;						  \
-	done
 
 includes: local-includes
 	for d in $(SUBDIRS); do (cd $$d && $(MAKE) includes); done
OpenPOWER on IntegriCloud