diff options
| author | EuAndreh <eu@euandre.org> | 2024-11-08 08:03:09 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2024-11-08 08:03:09 -0300 |
| commit | 7847f55afd5d705912d76c266aecd2918ace6eec (patch) | |
| tree | e8243f39332913116dc40669402f36855a241c6e | |
| parent | Makefile: Use lddeps(1) for library dependencies (diff) | |
| download | scrypt-7847f55afd5d705912d76c266aecd2918ace6eec.tar.gz scrypt-7847f55afd5d705912d76c266aecd2918ace6eec.tar.xz | |
Revert "Makefile: Use lddeps(1) for library dependencies"
This reverts commit 02862d9d64e830e4a3a7e5826fc10cc63c90cd89.
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | lddeps.txt | 1 |
2 files changed, 2 insertions, 7 deletions
@@ -9,7 +9,6 @@ PREFIX = /usr BINDIR = $(PREFIX)/bin LIBDIR = $(PREFIX)/lib GOLIBDIR = $(LIBDIR)/go -LDDEPSDIR = $(LIBDIR)/lddeps INCLUDEDIR = $(PREFIX)/include SRCDIR = $(PREFIX)/src/$(NAME) SHAREDIR = $(PREFIX)/share @@ -18,7 +17,7 @@ MANDIR = $(SHAREDIR)/man EXEC = ./ ## Where to store the installation. Empty by default. DESTDIR = -LDLIBS = --static `lddeps lddeps.txt` +LDLIBS = --static -lscrypt-kdf GOCFLAGS = -I $(GOLIBDIR) GOLDFLAGS = -L $(GOLIBDIR) @@ -36,7 +35,7 @@ GOLDFLAGS = -L $(GOLIBDIR) echo src/$(NAME).go src/version.go; fi) | uniq` .a.bin: - go tool link -L $(@D) $(GOLDFLAGS) -o $@ --extldflags "$(LDLIBS)" $< + go tool link -L $(@D) $(GOLDFLAGS) -o $@ --extldflags '$(LDLIBS)' $< @@ -189,12 +188,10 @@ install: all mkdir -p \ '$(DESTDIR)$(BINDIR)' \ '$(DESTDIR)$(GOLIBDIR)' \ - '$(DESTDIR)$(LDDEPSDIR)' \ '$(DESTDIR)$(SRCDIR)' \ cp $(NAME).bin '$(DESTDIR)$(BINDIR)'/$(NAME) cp src/$(NAME).a '$(DESTDIR)$(GOLIBDIR)' - cp lddeps.txt '$(DESTDIR)$(LDDEPSDIR)'/$(NAME).txt cp $(sources) '$(DESTDIR)$(SRCDIR)' ## Uninstalls from $(DESTDIR)$(PREFIX). This is a perfect mirror @@ -204,7 +201,6 @@ uninstall: rm -rf \ '$(DESTDIR)$(BINDIR)'/$(NAME) \ '$(DESTDIR)$(GOLIBDIR)'/$(NAME).a \ - '$(DESTDIR)$(LDDEPSDIR)'/$(NAME).txt \ '$(DESTDIR)$(SRCDIR)' \ diff --git a/lddeps.txt b/lddeps.txt deleted file mode 100644 index 17a3982..0000000 --- a/lddeps.txt +++ /dev/null @@ -1 +0,0 @@ -scrypt-kdf |