diff --git a/README.md b/README.md
index f6b80624..9a5e507b 100644
--- a/README.md
+++ b/README.md
@@ -150,8 +150,8 @@ Unzip the file "Kanzi_VS2022.zip" in place.
 The solution generates a Windows 64 binary and library.
 
 ### mingw-w64
-Go to the source directory and run 'make clean && mingw32-make.exe kanzi'. The Makefile contains 
-all the necessary targets. Tested successfully on Win64 with mingw-w64 g++ 8.1.0. 
+Go to the source directory and run 'make clean && mingw32-make.exe kanzi'. The Makefile contains
+all the necessary targets. Tested successfully on Win64 with mingw-w64 g++ 8.1.0.
 Multithreading is supported with g++ version 5.0.0 or newer.
 Builds successfully with C++11, C++14, C++17.
 
@@ -163,7 +163,7 @@ Builds successfully with C++98, C++11, C++14, C++17, C++20.
 
 ### macOS
 Go to the source directory and run 'make clean && make kanzi'. The Makefile contains all the necessary
-targets. Build successfully on MacOs with several versions of clang++. 
+targets. Build successfully on MacOs with several versions of clang++.
 Builds successfully with C++98, C++11, C++14, C++17, C++20.
 
 ### BSD
@@ -192,7 +192,7 @@ cmake ..
 make
 ctest
 ```
-By default, the cmake build generates a dynamically linked executable. 
+By default, the cmake build generates a dynamically linked executable.
 Choose ```make kanzi_static``` to build a statically linked executable.
 
 Credits
@@ -204,7 +204,7 @@ Yuta Mori,
 Ilya Muravyov,
 Neal Burns,
 Fabian Giesen,
-Jarek Duda, 
+Jarek Duda,
 Ilya Grebnov
 
 Disclaimer
diff --git a/src/Makefile b/src/Makefile
index 5158bf14..a3c818ee 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -152,6 +152,8 @@ STATIC_DECOMP_LIB := lib$(APP)decomp$(STATIC_LIB_SUFFIX)
 SHARED_COMP_LIB := lib$(APP)comp$(SHARED_LIB_SUFFIX)
 SHARED_DECOMP_LIB := lib$(APP)decomp$(SHARED_LIB_SUFFIX)
 
+all: lib test $(APP_STATIC) $(APP_DYNAMIC)
+
 libcomp: $(STATIC_COMP_LIB) $(SHARED_COMP_LIB)
 
 libdecomp: $(STATIC_DECOMP_LIB) $(SHARED_DECOMP_LIB)
@@ -226,7 +228,6 @@ kanzi_dynamic: LDFLAGS := $(filter-out -static,$(LDFLAGS))
 kanzi_dynamic: $(LIB_OBJECTS) $(APP_OBJECTS)
 	$(CXX) $^ -o ../bin/kanzi_dynamic$(PROG_SUFFIX) $(LDFLAGS)
 
-all: lib test $(APP_STATIC) $(APP_DYNAMIC)
 
 # Install / uninstall (may require sudo or admin rights)
 ifeq ($(DETECTED_OS),Windows)