diff options
author | Mattias Andrée <maandree@member.fsf.org> | 2017-10-15 20:35:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-15 20:35:01 +0200 |
commit | 7957e90332c34eda7b65075b8bddc1d18672a6bd (patch) | |
tree | bf0bc867eb99218c32426574721889f037fbcc47 | |
parent | Use basic config by default (diff) | |
parent | Makefile: use "rm -f" to prevent errors upon second cleaning (diff) | |
download | libkeccak-7957e90332c34eda7b65075b8bddc1d18672a6bd.tar.gz libkeccak-7957e90332c34eda7b65075b8bddc1d18672a6bd.tar.bz2 libkeccak-7957e90332c34eda7b65075b8bddc1d18672a6bd.tar.xz |
Merge pull request #6 from thebombzen/master
Two minor fixes
-rw-r--r-- | Makefile | 25 | ||||
-rw-r--r-- | benchmark.c | 2 | ||||
-rw-r--r-- | test.c | 2 |
3 files changed, 13 insertions, 16 deletions
@@ -186,22 +186,19 @@ install: libkeccak.$(LIBEXT) libkeccak.a cp -- LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/libkeccak/" uninstall: - -rm -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT).$(LIB_VERSION)" - -rm -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT).$(LIB_MAJOR)" - -rm -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT)" - -rm -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.a" - -cd "$(DESTDIR)$(PREFIX)/include" && rm -- $(HDR) - -rmdir -- "$(DESTDIR)$(PREFIX)/include/libkeccak/mac" - -rmdir -- "$(DESTDIR)$(PREFIX)/include/libkeccak" - -cd -- "$(DESTDIR)$(MANPREFIX)/man3" && rm -- $(MAN3) - -cd -- "$(DESTDIR)$(MANPREFIX)/man7" && rm -- $(MAN7) - -rm -- "$(DESTDIR)$(PREFIX)/share/licenses/libkeccak/LICENSE" - -rmdir -- "$(DESTDIR)$(PREFIX)/share/licenses/libkeccak" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT).$(LIB_VERSION)" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT).$(LIB_MAJOR)" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT)" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.a" + -rm -rf -- "$(DESTDIR)$(PREFIX)/include/libkeccak" + -cd -- "$(DESTDIR)$(MANPREFIX)/man3" && rm -f -- $(MAN3) + -cd -- "$(DESTDIR)$(MANPREFIX)/man7" && rm -f -- $(MAN7) + -rm -rf -- "$(DESTDIR)$(PREFIX)/share/licenses/libkeccak" clean: - -rm -r -- *.o libkeccak/*.o libkeccak/mac/*.o - -rm -r -- *.su libkeccak/*.su libkeccak/mac/*.su - -rm -- *.info *.pdf *.ps *.dvi *.a libkeccak.$(LIBEXT)* test benchmark benchfile + -rm -rf -- *.o libkeccak/*.o libkeccak/mac/*.o + -rm -rf -- *.su libkeccak/*.su libkeccak/mac/*.su + -rm -f -- *.info *.pdf *.ps *.dvi *.a libkeccak.$(LIBEXT)* test benchmark benchfile .SUFFIXES: .c.o diff --git a/benchmark.c b/benchmark.c index 20344d9..101c269 100644 --- a/benchmark.c +++ b/benchmark.c @@ -1,5 +1,5 @@ /* See LICENSE file for copyright and license details. */ -#include <libkeccak.h> +#include "libkeccak.h" #include <fcntl.h> #include <stdio.h> @@ -1,5 +1,5 @@ /* See LICENSE file for copyright and license details. */ -#include <libkeccak.h> +#include "libkeccak.h" #include <fcntl.h> #include <stdio.h> |