summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2019-11-28 09:53:42 +1100
committerDamien Miller <djm@mindrot.org>2019-11-28 09:53:42 +1100
commit323da82b8ea993b7f2c5793fd53b4f5ca105d19d (patch)
tree3b1f3b5ebf90ae72b21767864e9ee349cf52346c /Makefile.in
parentd8b2838c5d19bf409d44ede4d32df8ee47aeb4cd (diff)
(hopefully) fix out of tree builds of sk-dummy.so
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in16
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 80fb450b0..13bc833e3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -461,6 +461,7 @@ regress-prep:
461 $(MKDIR_P) `pwd`/regress/unittests/match 461 $(MKDIR_P) `pwd`/regress/unittests/match
462 $(MKDIR_P) `pwd`/regress/unittests/utf8 462 $(MKDIR_P) `pwd`/regress/unittests/utf8
463 $(MKDIR_P) `pwd`/regress/misc/kexfuzz 463 $(MKDIR_P) `pwd`/regress/misc/kexfuzz
464 $(MKDIR_P) `pwd`/regress/misc/sk-dummy
464 [ -f `pwd`/regress/Makefile ] || \ 465 [ -f `pwd`/regress/Makefile ] || \
465 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile 466 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
466 467
@@ -591,13 +592,16 @@ regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a
591 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 592 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
592 593
593# These all need to be compiled -fPIC, so they are treated differently. 594# These all need to be compiled -fPIC, so they are treated differently.
594SK_DUMMY_SRCS=\ 595SK_DUMMY_OBJS=\
595 regress/misc/sk-dummy/sk-dummy.c \ 596 regress/misc/sk-dummy/sk-dummy.lo \
596 ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c \ 597 ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo \
597 digest-openssl.c ssherr.c fatal.c sshbuf.c log.c cleanup.c 598 digest-openssl.lo ssherr.lo fatal.lo sshbuf.lo log.lo cleanup.lo
598 599
599regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_SRCS) 600.c.lo:
600 $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_SRCS) \ 601 $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@
602
603regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
604 $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $< \
601 -L. -Lopenbsd-compat -lopenbsd-compat $(LIBS) 605 -L. -Lopenbsd-compat -lopenbsd-compat $(LIBS)
602 606
603regress-binaries: regress-prep $(LIBCOMPAT) \ 607regress-binaries: regress-prep $(LIBCOMPAT) \