diff options
| author | Quentin Carbonneaux | 2021-10-03 22:22:35 +0200 |
|---|---|---|
| committer | Quentin Carbonneaux | 2021-10-03 22:22:35 +0200 |
| commit | 7095d76527ddf318330f34068dd595810bba17b8 (patch) | |
| tree | 4c74eb1be0473ac9ccb03b3563be112bd048edbb | |
| parent | 089fb901b6034f6a01312e57b44ab57508f9fdd8 (diff) | |
move lib/ in sdar/
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile | 30 | ||||
| m--------- | sdar/lib/BLAKE3 (renamed from lib/BLAKE3) | 0 | ||||
| m--------- | sdar/lib/lz4 (renamed from lib/lz4) | 0 |
5 files changed, 19 insertions, 19 deletions
@@ -1,7 +1,7 @@ *.sw[po] perf.data* sdar/blake3.h -lib/nacl-20110221 -lib/timestamp +sdar/lib/nacl-20110221 +sdar/lib/timestamp memex/memex obj/ diff --git a/.gitmodules b/.gitmodules index 6762a24..769a4a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "lib/lz4"] - path = lib/lz4 + path = sdar/lib/lz4 url = https://github.com/lz4/lz4.git [submodule "lib/BLAKE3"] - path = lib/BLAKE3 + path = sdar/lib/BLAKE3 url = https://github.com/BLAKE3-Team/BLAKE3 [submodule "memex/vendor/xxhash"] path = memex/vendor/xxhash @@ -8,12 +8,12 @@ endif NACL = nacl-20110221 NACLURL = https://hyperelliptic.org/nacl/$(NACL).tar.bz2 -NACLDIR = lib/$(NACL)/build/$(shell hostname | tr -dC [:alnum:]) +NACLDIR = sdar/lib/$(NACL)/build/$(shell hostname | tr -dC [:alnum:]) NACLINC = $(NACLDIR)/include/amd64 NACLLIB = -L$(NACLDIR)/lib/amd64 -lnacl $(NACLDIR)/lib/amd64/randombytes.o -LZ4INC = lib/lz4/lib -LZ4LIB = lib/lz4/lib/liblz4.a -BLAKE3INC = lib/BLAKE3/c +LZ4INC = sdar/lib/lz4/lib +LZ4LIB = sdar/lib/lz4/lib/liblz4.a +BLAKE3INC = sdar/lib/BLAKE3/c BLAKE3LIB = obj/blake3.a V = @ @@ -42,22 +42,22 @@ obj/%.o: sdar/%.c $(BLAKE3LIB): obj/timestamp @test -z "$(V)" || echo "cc/ar $@" - $(V)$(CC) $(B3FLAGS) -c lib/BLAKE3/c/blake3.c -o obj/blake3.o - $(V)$(CC) $(B3FLAGS) -c lib/BLAKE3/c/blake3_dispatch.c -o obj/blake3_dispatch.o - $(V)$(CC) $(B3FLAGS) -c lib/BLAKE3/c/blake3_avx2_x86-64_unix.S -o obj/blake3_avx2.o - $(V)$(CC) $(B3FLAGS) -c lib/BLAKE3/c/blake3_sse41_x86-64_unix.S -o obj/blake3_sse41.o - $(V)$(CC) $(B3FLAGS) -c lib/BLAKE3/c/blake3_portable.c -o obj/blake3_portable.o + $(V)$(CC) $(B3FLAGS) -c sdar/lib/BLAKE3/c/blake3.c -o obj/blake3.o + $(V)$(CC) $(B3FLAGS) -c sdar/lib/BLAKE3/c/blake3_dispatch.c -o obj/blake3_dispatch.o + $(V)$(CC) $(B3FLAGS) -c sdar/lib/BLAKE3/c/blake3_avx2_x86-64_unix.S -o obj/blake3_avx2.o + $(V)$(CC) $(B3FLAGS) -c sdar/lib/BLAKE3/c/blake3_sse41_x86-64_unix.S -o obj/blake3_sse41.o + $(V)$(CC) $(B3FLAGS) -c sdar/lib/BLAKE3/c/blake3_portable.c -o obj/blake3_portable.o $(V)ar crs $@ \ obj/blake3.o obj/blake3_dispatch.o \ obj/blake3_avx2.o obj/blake3_sse41.o obj/blake3_portable.o -lib/timestamp: - curl $(NACLURL) | tar -jxClib +sdar/lib/timestamp: + curl $(NACLURL) | tar -jxCsdar/lib # patch for crufty osx sed -ie 's/[a-z]*cc /&-Wno-implicit-function-declaration /' \ - lib/$(NACL)/okcompilers/c - cd lib/$(NACL) && ./do - make -C lib/lz4 + sdar/lib/$(NACL)/okcompilers/c + cd sdar/lib/$(NACL) && ./do + make -C sdar/lib/lz4 @touch $@ obj/timestamp: @@ -65,7 +65,7 @@ obj/timestamp: @touch $@ $(OBJ): sdar/all.h sdar/mmh.h -$(OBJ): lib/timestamp +$(OBJ): sdar/lib/timestamp $(OBJ): obj/timestamp clean: diff --git a/lib/BLAKE3 b/sdar/lib/BLAKE3 -Subproject 4b7babbe99c04bd573aad49db24484d07c574ae +Subproject 4b7babbe99c04bd573aad49db24484d07c574ae diff --git a/lib/lz4 b/sdar/lib/lz4 -Subproject d44371841a2f1728a3f36839fd4b7e872d0927d +Subproject d44371841a2f1728a3f36839fd4b7e872d0927d |