diff --git a/Makefile b/Makefile index 8522d9d5e81..55c24530b1a 100644 --- a/Makefile +++ b/Makefile @@ -122,8 +122,8 @@ contrib: lib $(MAKE) -C contrib/seekable_format/examples all $(MAKE) -C contrib/seekable_format/tests test $(MAKE) -C contrib/largeNbDicts all - cd contrib/single_file_libs/ ; ./build_decoder_test.sh - cd contrib/single_file_libs/ ; ./build_library_test.sh + cd build/single_file_libs/ ; ./build_decoder_test.sh + cd build/single_file_libs/ ; ./build_library_test.sh .PHONY: cleanTabs cleanTabs: diff --git a/contrib/single_file_libs/.gitignore b/build/single_file_libs/.gitignore similarity index 100% rename from contrib/single_file_libs/.gitignore rename to build/single_file_libs/.gitignore diff --git a/contrib/single_file_libs/README.md b/build/single_file_libs/README.md similarity index 96% rename from contrib/single_file_libs/README.md rename to build/single_file_libs/README.md index d88e8fc6bda..1705b769b85 100644 --- a/contrib/single_file_libs/README.md +++ b/build/single_file_libs/README.md @@ -11,7 +11,7 @@ This is the most common use case. The decompression library is small, adding, fo Create `zstddeclib.c` from the Zstd source using: ``` -cd zstd/contrib/single_file_libs +cd zstd/build/single_file_libs ./combine.sh -r ../../lib -o zstddeclib.c zstddeclib-in.c ``` Then add the resulting file to your project (see the [example files](examples)). @@ -25,7 +25,7 @@ The same tool can amalgamate the entire Zstd library for ease of adding both com Create `zstd.c` from the Zstd source using: ``` -cd zstd/contrib/single_file_libs +cd zstd/build/single_file_libs ./combine.sh -r ../../lib -o zstd.c zstd-in.c ``` It's possible to create a compressor-only library but since the decompressor is so small in comparison this doesn't bring much of a gain (but for the curious, simply remove the files in the _decompress_ section at the end of `zstd-in.c`). diff --git a/contrib/single_file_libs/build_decoder_test.sh b/build/single_file_libs/build_decoder_test.sh similarity index 100% rename from contrib/single_file_libs/build_decoder_test.sh rename to build/single_file_libs/build_decoder_test.sh diff --git a/contrib/single_file_libs/build_library_test.sh b/build/single_file_libs/build_library_test.sh similarity index 100% rename from contrib/single_file_libs/build_library_test.sh rename to build/single_file_libs/build_library_test.sh diff --git a/contrib/single_file_libs/combine.sh b/build/single_file_libs/combine.sh similarity index 100% rename from contrib/single_file_libs/combine.sh rename to build/single_file_libs/combine.sh diff --git a/contrib/single_file_libs/create_single_file_decoder.sh b/build/single_file_libs/create_single_file_decoder.sh similarity index 100% rename from contrib/single_file_libs/create_single_file_decoder.sh rename to build/single_file_libs/create_single_file_decoder.sh diff --git a/contrib/single_file_libs/create_single_file_library.sh b/build/single_file_libs/create_single_file_library.sh similarity index 100% rename from contrib/single_file_libs/create_single_file_library.sh rename to build/single_file_libs/create_single_file_library.sh diff --git a/contrib/single_file_libs/examples/README.md b/build/single_file_libs/examples/README.md similarity index 100% rename from contrib/single_file_libs/examples/README.md rename to build/single_file_libs/examples/README.md diff --git a/contrib/single_file_libs/examples/emscripten.c b/build/single_file_libs/examples/emscripten.c similarity index 100% rename from contrib/single_file_libs/examples/emscripten.c rename to build/single_file_libs/examples/emscripten.c diff --git a/contrib/single_file_libs/examples/roundtrip.c b/build/single_file_libs/examples/roundtrip.c similarity index 100% rename from contrib/single_file_libs/examples/roundtrip.c rename to build/single_file_libs/examples/roundtrip.c diff --git a/contrib/single_file_libs/examples/shell.html b/build/single_file_libs/examples/shell.html similarity index 100% rename from contrib/single_file_libs/examples/shell.html rename to build/single_file_libs/examples/shell.html diff --git a/contrib/single_file_libs/examples/simple.c b/build/single_file_libs/examples/simple.c similarity index 100% rename from contrib/single_file_libs/examples/simple.c rename to build/single_file_libs/examples/simple.c diff --git a/contrib/single_file_libs/examples/testcard-dxt1.inl b/build/single_file_libs/examples/testcard-dxt1.inl similarity index 100% rename from contrib/single_file_libs/examples/testcard-dxt1.inl rename to build/single_file_libs/examples/testcard-dxt1.inl diff --git a/contrib/single_file_libs/examples/testcard-zstd.inl b/build/single_file_libs/examples/testcard-zstd.inl similarity index 100% rename from contrib/single_file_libs/examples/testcard-zstd.inl rename to build/single_file_libs/examples/testcard-zstd.inl diff --git a/contrib/single_file_libs/examples/testcard.png b/build/single_file_libs/examples/testcard.png similarity index 100% rename from contrib/single_file_libs/examples/testcard.png rename to build/single_file_libs/examples/testcard.png diff --git a/contrib/single_file_libs/zstd-in.c b/build/single_file_libs/zstd-in.c similarity index 100% rename from contrib/single_file_libs/zstd-in.c rename to build/single_file_libs/zstd-in.c diff --git a/contrib/single_file_libs/zstddeclib-in.c b/build/single_file_libs/zstddeclib-in.c similarity index 100% rename from contrib/single_file_libs/zstddeclib-in.c rename to build/single_file_libs/zstddeclib-in.c