From fd95be0adeb043fa344d0513cf7ab483adfedadf Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Tue, 4 Apr 2017 16:30:11 -0700 Subject: [PATCH] Move sources to lib/zstd/ --- contrib/linux-kernel/lib/{ => zstd}/bitstream.h | 0 contrib/linux-kernel/lib/{ => zstd}/entropy_common.c | 0 contrib/linux-kernel/lib/{ => zstd}/error_private.h | 0 contrib/linux-kernel/lib/{ => zstd}/fse.h | 0 contrib/linux-kernel/lib/{ => zstd}/fse_compress.c | 0 contrib/linux-kernel/lib/{ => zstd}/fse_decompress.c | 0 contrib/linux-kernel/lib/{ => zstd}/huf.h | 0 contrib/linux-kernel/lib/{ => zstd}/huf_compress.c | 0 contrib/linux-kernel/lib/{ => zstd}/huf_decompress.c | 0 contrib/linux-kernel/lib/{ => zstd}/mem.h | 0 contrib/linux-kernel/lib/{ => zstd}/xxhash.c | 0 contrib/linux-kernel/lib/{ => zstd}/xxhash.h | 0 contrib/linux-kernel/lib/{ => zstd}/zstd_common.c | 0 contrib/linux-kernel/lib/{ => zstd}/zstd_compress.c | 0 contrib/linux-kernel/lib/{ => zstd}/zstd_decompress.c | 0 contrib/linux-kernel/lib/{ => zstd}/zstd_internal.h | 0 contrib/linux-kernel/lib/{ => zstd}/zstd_opt.h | 0 contrib/linux-kernel/test/Makefile | 10 +++++----- 18 files changed, 5 insertions(+), 5 deletions(-) rename contrib/linux-kernel/lib/{ => zstd}/bitstream.h (100%) rename contrib/linux-kernel/lib/{ => zstd}/entropy_common.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/error_private.h (100%) rename contrib/linux-kernel/lib/{ => zstd}/fse.h (100%) rename contrib/linux-kernel/lib/{ => zstd}/fse_compress.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/fse_decompress.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/huf.h (100%) rename contrib/linux-kernel/lib/{ => zstd}/huf_compress.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/huf_decompress.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/mem.h (100%) rename contrib/linux-kernel/lib/{ => zstd}/xxhash.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/xxhash.h (100%) rename contrib/linux-kernel/lib/{ => zstd}/zstd_common.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/zstd_compress.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/zstd_decompress.c (100%) rename contrib/linux-kernel/lib/{ => zstd}/zstd_internal.h (100%) rename contrib/linux-kernel/lib/{ => zstd}/zstd_opt.h (100%) diff --git a/contrib/linux-kernel/lib/bitstream.h b/contrib/linux-kernel/lib/zstd/bitstream.h similarity index 100% rename from contrib/linux-kernel/lib/bitstream.h rename to contrib/linux-kernel/lib/zstd/bitstream.h diff --git a/contrib/linux-kernel/lib/entropy_common.c b/contrib/linux-kernel/lib/zstd/entropy_common.c similarity index 100% rename from contrib/linux-kernel/lib/entropy_common.c rename to contrib/linux-kernel/lib/zstd/entropy_common.c diff --git a/contrib/linux-kernel/lib/error_private.h b/contrib/linux-kernel/lib/zstd/error_private.h similarity index 100% rename from contrib/linux-kernel/lib/error_private.h rename to contrib/linux-kernel/lib/zstd/error_private.h diff --git a/contrib/linux-kernel/lib/fse.h b/contrib/linux-kernel/lib/zstd/fse.h similarity index 100% rename from contrib/linux-kernel/lib/fse.h rename to contrib/linux-kernel/lib/zstd/fse.h diff --git a/contrib/linux-kernel/lib/fse_compress.c b/contrib/linux-kernel/lib/zstd/fse_compress.c similarity index 100% rename from contrib/linux-kernel/lib/fse_compress.c rename to contrib/linux-kernel/lib/zstd/fse_compress.c diff --git a/contrib/linux-kernel/lib/fse_decompress.c b/contrib/linux-kernel/lib/zstd/fse_decompress.c similarity index 100% rename from contrib/linux-kernel/lib/fse_decompress.c rename to contrib/linux-kernel/lib/zstd/fse_decompress.c diff --git a/contrib/linux-kernel/lib/huf.h b/contrib/linux-kernel/lib/zstd/huf.h similarity index 100% rename from contrib/linux-kernel/lib/huf.h rename to contrib/linux-kernel/lib/zstd/huf.h diff --git a/contrib/linux-kernel/lib/huf_compress.c b/contrib/linux-kernel/lib/zstd/huf_compress.c similarity index 100% rename from contrib/linux-kernel/lib/huf_compress.c rename to contrib/linux-kernel/lib/zstd/huf_compress.c diff --git a/contrib/linux-kernel/lib/huf_decompress.c b/contrib/linux-kernel/lib/zstd/huf_decompress.c similarity index 100% rename from contrib/linux-kernel/lib/huf_decompress.c rename to contrib/linux-kernel/lib/zstd/huf_decompress.c diff --git a/contrib/linux-kernel/lib/mem.h b/contrib/linux-kernel/lib/zstd/mem.h similarity index 100% rename from contrib/linux-kernel/lib/mem.h rename to contrib/linux-kernel/lib/zstd/mem.h diff --git a/contrib/linux-kernel/lib/xxhash.c b/contrib/linux-kernel/lib/zstd/xxhash.c similarity index 100% rename from contrib/linux-kernel/lib/xxhash.c rename to contrib/linux-kernel/lib/zstd/xxhash.c diff --git a/contrib/linux-kernel/lib/xxhash.h b/contrib/linux-kernel/lib/zstd/xxhash.h similarity index 100% rename from contrib/linux-kernel/lib/xxhash.h rename to contrib/linux-kernel/lib/zstd/xxhash.h diff --git a/contrib/linux-kernel/lib/zstd_common.c b/contrib/linux-kernel/lib/zstd/zstd_common.c similarity index 100% rename from contrib/linux-kernel/lib/zstd_common.c rename to contrib/linux-kernel/lib/zstd/zstd_common.c diff --git a/contrib/linux-kernel/lib/zstd_compress.c b/contrib/linux-kernel/lib/zstd/zstd_compress.c similarity index 100% rename from contrib/linux-kernel/lib/zstd_compress.c rename to contrib/linux-kernel/lib/zstd/zstd_compress.c diff --git a/contrib/linux-kernel/lib/zstd_decompress.c b/contrib/linux-kernel/lib/zstd/zstd_decompress.c similarity index 100% rename from contrib/linux-kernel/lib/zstd_decompress.c rename to contrib/linux-kernel/lib/zstd/zstd_decompress.c diff --git a/contrib/linux-kernel/lib/zstd_internal.h b/contrib/linux-kernel/lib/zstd/zstd_internal.h similarity index 100% rename from contrib/linux-kernel/lib/zstd_internal.h rename to contrib/linux-kernel/lib/zstd/zstd_internal.h diff --git a/contrib/linux-kernel/lib/zstd_opt.h b/contrib/linux-kernel/lib/zstd/zstd_opt.h similarity index 100% rename from contrib/linux-kernel/lib/zstd_opt.h rename to contrib/linux-kernel/lib/zstd/zstd_opt.h diff --git a/contrib/linux-kernel/test/Makefile b/contrib/linux-kernel/test/Makefile index b16964f8..01e877b7 100644 --- a/contrib/linux-kernel/test/Makefile +++ b/contrib/linux-kernel/test/Makefile @@ -1,7 +1,7 @@ -IFLAGS := -isystem include/ -I ../include/ -I ../lib/ -isystem googletest/googletest/include +IFLAGS := -isystem include/ -I ../include/ -I ../lib/zstd/ -isystem googletest/googletest/include -SOURCES := $(wildcard ../lib/*.c) +SOURCES := $(wildcard ../lib/zstd/*.c) OBJECTS := $(patsubst %.c,%.o,$(SOURCES)) ARFLAGS := rcs @@ -9,10 +9,10 @@ CXXFLAGS += -std=c++11 CFLAGS += -g -O0 CPPFLAGS += $(IFLAGS) -../lib/libzstd.a: $(OBJECTS) +../lib/zstd/libzstd.a: $(OBJECTS) $(AR) $(ARFLAGS) $@ $^ -UserlandTest: UserlandTest.cpp ../lib/libzstd.a +UserlandTest: UserlandTest.cpp ../lib/zstd/libzstd.a $(CXX) $(CXXFLAGS) $(CFLAGS) $(CPPFLAGS) $^ googletest/build/googlemock/gtest/libgtest.a googletest/build/googlemock/gtest/libgtest_main.a -o $@ # Install googletest @@ -24,4 +24,4 @@ googletest: @cd googletest/build && cmake .. && $(MAKE) clean: - $(RM) -f *.{o,a} ../lib/*.{o,a} + $(RM) -f *.{o,a} ../lib/zstd/*.{o,a}