From 3ed7e424575bc60b8f97b2cc5a6be9bfcd9e2565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Fri, 1 Nov 2002 11:14:27 +0100 Subject: [PATCH] (LIBOBJS): Put @LIBOBJS@ into the make variable LIBOBJS. (CLEANFILES): Delete libnettle.so. (clean-local): Delete the .lib linkfarm. ($(SHLIBFORLINK)): When building libnettle.so, create a link from .lib/$SHLIBSONAME. Needed at runtime, for the testsuite. Rev: src/nettle/Makefile.am:1.50 --- Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fd6e6cb1..ed9e766f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,8 @@ libnettle_a_SOURCES = aes.c aes.h aes-internal.h \ nettle-meta.h \ nettle-internal.c nettle-internal.h nettle-openssl.c -libnettle_a_LIBADD = @LIBOBJS@ +LIBOBJS = @LIBOBJS@ +libnettle_a_LIBADD = $(LIBOBJS) shadata_LDADD = -lm @@ -65,6 +66,9 @@ EXTRA_DIST = macros.h memxor.h $(des_headers) descore.README nettle.html \ x86/aes.asm x86/aes_tables.asm DISTCLEANFILES = aes.asm aes-decrypt.asm aes-encrypt.asm machine.m4 +CLEANFILES = $(SHLIBFORLINK) +clean-local: + rm -rf .lib # Using assembler files. Should get precedence before the .c.o rule. SUFFIXES = .asm @@ -106,6 +110,8 @@ SHLIBOBJECTS = $(patsubst %.$(OBJEXT),%_p.$(OBJEXT),$(am_libnettle_a_OBJECTS) $( $(SHLIBFORLINK): $(SHLIBOBJECTS) $(SHLIBLINK) $^ -o $@ + -mkdir .lib 2>/dev/null + (cd .lib && ln -sf ../$(SHLIBFORLINK) $(SHLIBSONAME)) install-shared: $(SHLIBFORLINK) $(INSTALL_DATA) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE) -- GitLab