diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index c9e4294d3..acfb919da 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -49,7 +49,6 @@ PICFLAG=@PICFLAG@ | |||
49 | LIBS=@LIBS@ | 49 | LIBS=@LIBS@ |
50 | K5LIBS=@K5LIBS@ | 50 | K5LIBS=@K5LIBS@ |
51 | GSSLIBS=@GSSLIBS@ | 51 | GSSLIBS=@GSSLIBS@ |
52 | SSHLIBS=@SSHLIBS@ | ||
53 | SSHDLIBS=@SSHDLIBS@ | 52 | SSHDLIBS=@SSHDLIBS@ |
54 | LIBEDIT=@LIBEDIT@ | 53 | LIBEDIT=@LIBEDIT@ |
55 | LIBFIDO2=@LIBFIDO2@ | 54 | LIBFIDO2=@LIBFIDO2@ |
@@ -58,7 +57,6 @@ AWK=@AWK@ | |||
58 | RANLIB=@RANLIB@ | 57 | RANLIB=@RANLIB@ |
59 | INSTALL=@INSTALL@ | 58 | INSTALL=@INSTALL@ |
60 | SED=@SED@ | 59 | SED=@SED@ |
61 | ENT=@ENT@ | ||
62 | XAUTH_PATH=@XAUTH_PATH@ | 60 | XAUTH_PATH=@XAUTH_PATH@ |
63 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | 61 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
64 | LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@ | 62 | LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@ |
@@ -189,7 +187,7 @@ $(SSHOBJS): Makefile.in config.h | |||
189 | $(SSHDOBJS): Makefile.in config.h | 187 | $(SSHDOBJS): Makefile.in config.h |
190 | configure-check: $(srcdir)/configure | 188 | configure-check: $(srcdir)/configure |
191 | 189 | ||
192 | $(srcdir)/configure: configure.ac aclocal.m4 | 190 | $(srcdir)/configure: configure.ac $(srcdir)/m4/*.m4 |
193 | @echo "ERROR: configure is out of date; please run ${AUTORECONF} (and configure)" 1>&2 | 191 | @echo "ERROR: configure is out of date; please run ${AUTORECONF} (and configure)" 1>&2 |
194 | @exit 1 | 192 | @exit 1 |
195 | 193 | ||
@@ -206,7 +204,7 @@ libssh.a: $(LIBSSH_OBJS) | |||
206 | $(RANLIB) $@ | 204 | $(RANLIB) $@ |
207 | 205 | ||
208 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | 206 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) |
209 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS) | 207 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(GSSLIBS) |
210 | 208 | ||
211 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 209 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
212 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) | 210 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) |
@@ -277,6 +275,8 @@ clean: regressclean | |||
277 | rm -f regress/unittests/sshbuf/test_sshbuf$(EXEEXT) | 275 | rm -f regress/unittests/sshbuf/test_sshbuf$(EXEEXT) |
278 | rm -f regress/unittests/sshkey/*.o | 276 | rm -f regress/unittests/sshkey/*.o |
279 | rm -f regress/unittests/sshkey/test_sshkey$(EXEEXT) | 277 | rm -f regress/unittests/sshkey/test_sshkey$(EXEEXT) |
278 | rm -f regress/unittests/sshsig/*.o | ||
279 | rm -f regress/unittests/sshsig/test_sshsig$(EXEEXT) | ||
280 | rm -f regress/unittests/bitmap/*.o | 280 | rm -f regress/unittests/bitmap/*.o |
281 | rm -f regress/unittests/bitmap/test_bitmap$(EXEEXT) | 281 | rm -f regress/unittests/bitmap/test_bitmap$(EXEEXT) |
282 | rm -f regress/unittests/conversion/*.o | 282 | rm -f regress/unittests/conversion/*.o |
@@ -310,6 +310,8 @@ distclean: regressclean | |||
310 | rm -f regress/unittests/sshbuf/test_sshbuf | 310 | rm -f regress/unittests/sshbuf/test_sshbuf |
311 | rm -f regress/unittests/sshkey/*.o | 311 | rm -f regress/unittests/sshkey/*.o |
312 | rm -f regress/unittests/sshkey/test_sshkey | 312 | rm -f regress/unittests/sshkey/test_sshkey |
313 | rm -f regress/unittests/sshsig/*.o | ||
314 | rm -f regress/unittests/sshsig/test_sshsig | ||
313 | rm -f regress/unittests/bitmap/*.o | 315 | rm -f regress/unittests/bitmap/*.o |
314 | rm -f regress/unittests/bitmap/test_bitmap | 316 | rm -f regress/unittests/bitmap/test_bitmap |
315 | rm -f regress/unittests/conversion/*.o | 317 | rm -f regress/unittests/conversion/*.o |
@@ -488,6 +490,7 @@ regress-prep: | |||
488 | $(MKDIR_P) `pwd`/regress/unittests/test_helper | 490 | $(MKDIR_P) `pwd`/regress/unittests/test_helper |
489 | $(MKDIR_P) `pwd`/regress/unittests/sshbuf | 491 | $(MKDIR_P) `pwd`/regress/unittests/sshbuf |
490 | $(MKDIR_P) `pwd`/regress/unittests/sshkey | 492 | $(MKDIR_P) `pwd`/regress/unittests/sshkey |
493 | $(MKDIR_P) `pwd`/regress/unittests/sshsig | ||
491 | $(MKDIR_P) `pwd`/regress/unittests/bitmap | 494 | $(MKDIR_P) `pwd`/regress/unittests/bitmap |
492 | $(MKDIR_P) `pwd`/regress/unittests/conversion | 495 | $(MKDIR_P) `pwd`/regress/unittests/conversion |
493 | $(MKDIR_P) `pwd`/regress/unittests/hostkeys | 496 | $(MKDIR_P) `pwd`/regress/unittests/hostkeys |
@@ -559,6 +562,17 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ | |||
559 | regress/unittests/test_helper/libtest_helper.a \ | 562 | regress/unittests/test_helper/libtest_helper.a \ |
560 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 563 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
561 | 564 | ||
565 | UNITTESTS_TEST_SSHSIG_OBJS=\ | ||
566 | sshsig.o \ | ||
567 | regress/unittests/sshsig/tests.o \ | ||
568 | $(SKOBJS) | ||
569 | |||
570 | regress/unittests/sshsig/test_sshsig$(EXEEXT): ${UNITTESTS_TEST_SSHSIG_OBJS} \ | ||
571 | regress/unittests/test_helper/libtest_helper.a libssh.a | ||
572 | $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHSIG_OBJS) \ | ||
573 | regress/unittests/test_helper/libtest_helper.a \ | ||
574 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
575 | |||
562 | UNITTESTS_TEST_BITMAP_OBJS=\ | 576 | UNITTESTS_TEST_BITMAP_OBJS=\ |
563 | regress/unittests/bitmap/tests.o | 577 | regress/unittests/bitmap/tests.o |
564 | 578 | ||
@@ -655,6 +669,7 @@ regress-binaries: regress-prep $(LIBCOMPAT) \ | |||
655 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ | 669 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ |
656 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 670 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
657 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ | 671 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ |
672 | regress/unittests/sshsig/test_sshsig$(EXEEXT) \ | ||
658 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ | 673 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ |
659 | regress/unittests/conversion/test_conversion$(EXEEXT) \ | 674 | regress/unittests/conversion/test_conversion$(EXEEXT) \ |
660 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ | 675 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ |