Deleted Added
sdiff udiff text old ( 239844 ) new ( 248613 )
full compact
Makefile.in (239844) Makefile.in (248613)
1# $Id: Makefile.in,v 1.326 2012/04/04 01:27:57 djm Exp $
1# $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim Exp $
2
3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@
5
6AUTORECONF=autoreconf
7
8prefix=@prefix@
9exec_prefix=@exec_prefix@

--- 22 unchanged lines hidden (view full) ---

32
33PATHS= -DSSHDIR=\"$(sysconfdir)\" \
34 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
35 -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
36 -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
37 -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \
38 -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \
39 -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
2
3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@
5
6AUTORECONF=autoreconf
7
8prefix=@prefix@
9exec_prefix=@exec_prefix@

--- 22 unchanged lines hidden (view full) ---

32
33PATHS= -DSSHDIR=\"$(sysconfdir)\" \
34 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
35 -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
36 -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
37 -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \
38 -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \
39 -D_PATH_SSH_PIDDIR=\"$(piddir)\" \
40 -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \
40 -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\"
41
42CC=@CC@
43LD=@LD@
44CFLAGS=@CFLAGS@
45CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
46LIBS=@LIBS@
41
42CC=@CC@
43LD=@LD@
44CFLAGS=@CFLAGS@
45CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
46LIBS=@LIBS@
47K5LIBS=@K5LIBS@
48GSSLIBS=@GSSLIBS@
47SSHLIBS=@SSHLIBS@
48SSHDLIBS=@SSHDLIBS@
49LIBEDIT=@LIBEDIT@
50AR=@AR@
51AWK=@AWK@
52RANLIB=@RANLIB@
53INSTALL=@INSTALL@
54PERL=@PERL@
55SED=@SED@
56ENT=@ENT@
57XAUTH_PATH=@XAUTH_PATH@
58LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
59EXEEXT=@EXEEXT@
60MANFMT=@MANFMT@
61
62TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
63
49SSHLIBS=@SSHLIBS@
50SSHDLIBS=@SSHDLIBS@
51LIBEDIT=@LIBEDIT@
52AR=@AR@
53AWK=@AWK@
54RANLIB=@RANLIB@
55INSTALL=@INSTALL@
56PERL=@PERL@
57SED=@SED@
58ENT=@ENT@
59XAUTH_PATH=@XAUTH_PATH@
60LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
61EXEEXT=@EXEEXT@
62MANFMT=@MANFMT@
63
64TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
65
64LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
65 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
66LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
67 canohost.o channels.o cipher.o cipher-aes.o \
66 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
67 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
68 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
69 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
70 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
71 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
72 kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
68 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
69 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
70 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
71 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
72 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
73 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
74 kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
73 msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \
74 schnorr.o ssh-pkcs11.o
75 msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
76 jpake.o schnorr.o ssh-pkcs11.o krl.o
75
76SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
77 sshconnect.o sshconnect1.o sshconnect2.o mux.o \
78 roaming_common.o roaming_client.o
79
80SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
81 audit.o audit-bsm.o audit-linux.o platform.o \
82 sshpty.o sshlogin.o servconf.o serverloop.o \

--- 51 unchanged lines hidden (view full) ---

134 (cd openbsd-compat && $(MAKE))
135always:
136
137libssh.a: $(LIBSSH_OBJS)
138 $(AR) rv $@ $(LIBSSH_OBJS)
139 $(RANLIB) $@
140
141ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
77
78SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
79 sshconnect.o sshconnect1.o sshconnect2.o mux.o \
80 roaming_common.o roaming_client.o
81
82SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
83 audit.o audit-bsm.o audit-linux.o platform.o \
84 sshpty.o sshlogin.o servconf.o serverloop.o \

--- 51 unchanged lines hidden (view full) ---

136 (cd openbsd-compat && $(MAKE))
137always:
138
139libssh.a: $(LIBSSH_OBJS)
140 $(AR) rv $@ $(LIBSSH_OBJS)
141 $(RANLIB) $@
142
143ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
142 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS)
144 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)
143
144sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
145
146sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
145 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)
147 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)
146
147scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
148 $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
149
150ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
151 $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
152
153ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o

--- 36 unchanged lines hidden (view full) ---

190$(CONFIGFILES): $(CONFIGFILES_IN)
191 conffile=`echo $@ | sed 's/.out$$//'`; \
192 $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
193
194# fake rule to stop make trying to compile moduli.o into a binary "moduli.o"
195moduli:
196 echo
197
148
149scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
150 $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
151
152ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
153 $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
154
155ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o

--- 36 unchanged lines hidden (view full) ---

192$(CONFIGFILES): $(CONFIGFILES_IN)
193 conffile=`echo $@ | sed 's/.out$$//'`; \
194 $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
195
196# fake rule to stop make trying to compile moduli.o into a binary "moduli.o"
197moduli:
198 echo
199
200# special case target for umac128
201umac128.o: umac.c
202 $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \
203 -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \
204 -Dumac_update=umac128_update -Dumac_final=umac128_final \
205 -Dumac_delete=umac128_delete
206
198clean: regressclean
199 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
200 rm -f *.out core survey
201 (cd openbsd-compat && $(MAKE) clean)
202
203distclean: regressclean
204 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
205 rm -f *.out core opensshd.init openssh.xml

--- 161 unchanged lines hidden (view full) ---

367 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
368 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
369 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
370 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
371 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
372 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
373 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
374
207clean: regressclean
208 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
209 rm -f *.out core survey
210 (cd openbsd-compat && $(MAKE) clean)
211
212distclean: regressclean
213 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
214 rm -f *.out core opensshd.init openssh.xml

--- 161 unchanged lines hidden (view full) ---

376 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1
377 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
378 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
379 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
380 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
381 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
382 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
383
375tests interop-tests: $(TARGETS)
384regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
385 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
386 $(CC) $(CPPFLAGS) -o $@ $? \
387 $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
388
389tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)
376 BUILDDIR=`pwd`; \
377 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
378 [ -f `pwd`/regress/Makefile ] || \
379 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
380 TEST_SHELL="@TEST_SHELL@"; \
381 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
382 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
383 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \

--- 60 unchanged lines hidden --- 		390 BUILDDIR=`pwd`; \
391 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
392 [ -f `pwd`/regress/Makefile ] || \
393 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
394 TEST_SHELL="@TEST_SHELL@"; \
395 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
396 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
397 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \

--- 60 unchanged lines hidden ---