diff --git a/aarbology2/makefile.conf b/aarbology2/makefile.conf
index 831715705f536a279b09642dd308007898ffa4d8..5ada1c8807256ab3c6baa10beda0926a983e41dd 100644
--- a/aarbology2/makefile.conf
+++ b/aarbology2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aarbology2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/acast2/makefile.conf b/acast2/makefile.conf
index 74693944a9b72fd232b6993f79a2960fb36a4b6f..1dc893db806278c9194d7ea00f3e9c9b13ada470 100644
--- a/acast2/makefile.conf
+++ b/acast2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=acast2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/acompaction2/makefile.conf b/acompaction2/makefile.conf
index 9981fe67f386a34811eea4befef55eb031909889..8dd4c0f39810ef880d826f729f7e7df97f662acf 100644
--- a/acompaction2/makefile.conf
+++ b/acompaction2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=acompaction2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aconversions2/makefile.conf b/aconversions2/makefile.conf
index b02ee8d1f938e8a07400b99016ac38ac576ac667..40c3b813b6eb4d2a19e160b9f521f54ef8f8cddd 100644
--- a/aconversions2/makefile.conf
+++ b/aconversions2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aconversions2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aderivation2/makefile.conf b/aderivation2/makefile.conf
index ba3ff620a5ea95379acb078c8c8da7b62fb1c70e..67c50ae1258c7518abcc84b2bf5fea44644d9177 100644
--- a/aderivation2/makefile.conf
+++ b/aderivation2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aderivation2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/adeterminize2/makefile.conf b/adeterminize2/makefile.conf
index 5f6a1dcdc70672bb2ee598e0251a6501e37e4652..020e07e7f371ab68823d5eeece170fd96b32a899 100644
--- a/adeterminize2/makefile.conf
+++ b/adeterminize2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=adeterminize2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aepsilon2/makefile.conf b/aepsilon2/makefile.conf
index d8c96e7b40d15189ba8b8baa55cd141a8933bb65..ed5d5f4f8a604859cb51d4a776fcd6ec7af2be5a 100644
--- a/aepsilon2/makefile.conf
+++ b/aepsilon2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aepsilon2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/agenerate2/makefile.conf b/agenerate2/makefile.conf
index 5cd7072694cc0172331a0abfc023885556892135..dff9303bc84f59f186c68d81d37e7247c315f543 100644
--- a/agenerate2/makefile.conf
+++ b/agenerate2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=agenerate2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aintegral2/makefile.conf b/aintegral2/makefile.conf
index c0f567bf65d53975eb66b380d6f70365378f1c48..891a6e9eb140e6643af59afc3ab5672f14c4bf3d 100644
--- a/aintegral2/makefile.conf
+++ b/aintegral2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aintegral2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alangop2/makefile.conf b/alangop2/makefile.conf
index abc88450c8edf2ba6488a16f6e542dac04bdc27d..d17072d5dd2a869a1f19cbd22a7300474a15bcb6 100644
--- a/alangop2/makefile.conf
+++ b/alangop2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=alangop2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aminimize2/makefile.conf b/aminimize2/makefile.conf
index eba256abe1be42f8411b9d4e6abbd3c4a0b9bedb..f22c79fd37495167564a4dc2908a4fae79b7f9e7 100644
--- a/aminimize2/makefile.conf
+++ b/aminimize2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aminimize2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/anormalize2/makefile.conf b/anormalize2/makefile.conf
index f5f02c777b6172ce12e254f58e05c9ec18a87e12..037040337f01c8dcacc4aeca690821f2f84a4b59 100644
--- a/anormalize2/makefile.conf
+++ b/anormalize2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=anormalize2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aquery2/makefile.conf b/aquery2/makefile.conf
index 06e0b01dbca46182c66419819bab4ff940202971..a422f5ec0da44e53ad30477300cf13979e5b4812 100644
--- a/aquery2/makefile.conf
+++ b/aquery2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aquery2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/arand2/makefile.conf b/arand2/makefile.conf
index 0abaa7509b69d4f28e37553b0cf70aa246d4222d..028803f954dc4e5515553cc60f8f4593d575e668 100644
--- a/arand2/makefile.conf
+++ b/arand2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=arand2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/arename2/makefile.conf b/arename2/makefile.conf
index b879449cdeaecdc1a46780151dd80c6cd25a471e..52d0722bd1bc9e1e37d484e8499b77200dbeab8f 100644
--- a/arename2/makefile.conf
+++ b/arename2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=arename2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/areverse2/makefile.conf b/areverse2/makefile.conf
index 963a354de8bd0883375eec0b9886576d9da8d160..d419b2776fa3cb1f7165824ae8a456bbd93af308 100644
--- a/areverse2/makefile.conf
+++ b/areverse2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=areverse2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/arun2/makefile.conf b/arun2/makefile.conf
index 6cf62b7b59a1ea96cebb5e68388211d01fcbe968..9eada94443414fa335acc77ecb2cd5b79a472021 100644
--- a/arun2/makefile.conf
+++ b/arun2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=arun2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/astat2/makefile.conf b/astat2/makefile.conf
index 1123c5e210d6cf831c7fd85099fdc4728f2ded02..7c39c67922bc88ed6065fff13aea0c2bc19af0b1 100644
--- a/astat2/makefile.conf
+++ b/astat2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=astat2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/astringology2/makefile.conf b/astringology2/makefile.conf
index e37acf3feae2b983baa473386b40caebc19f2401..dcceb9e6eea0d6422413ddc595dca06bf3ecdc0e 100644
--- a/astringology2/makefile.conf
+++ b/astringology2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=astringology2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/atrim2/makefile.conf b/atrim2/makefile.conf
index 6874155da52e39164ca89861ad76210cc6339163..c732a116c66c4c5cbc68dc9b7b26d1d9309494b8 100644
--- a/atrim2/makefile.conf
+++ b/atrim2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=atrim2
-LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2cli/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/makefile-library b/makefile-library
index 63ef60e14f40bfc0899f9673f72aea066b73e007..09aaeb93080071dfdd7dad9ac654bb9f29a37e30 100644
--- a/makefile-library
+++ b/makefile-library
@@ -22,10 +22,10 @@ CXX_FLAGS := -Wall -pedantic -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qua
 
 space := $(eval) $(eval)
 
-LDFLAGS_DEBUG:=-rdynamic -shared
+LDFLAGS_DEBUG:=-rdynamic -shared $(addprefix -L, $(addsuffix lib-debug, $(LINK_PATHS))) $(addprefix -l, $(LINK_LIBRARIES))
 TEST_LDFLAGS_DEBUG:=-Wl,--no-as-needed -Llib-debug $(addprefix -L, $(addsuffix lib-debug, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,.
 
-LDFLAGS_RELEASE:=-rdynamic -shared $(LTO_PARAM)
+LDFLAGS_RELEASE:=-rdynamic -shared $(LTO_PARAM) $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) $(addprefix -l, $(LINK_LIBRARIES))
 TEST_LDFLAGS_RELEASE:=-Wl,--no-as-needed -Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit $(LTO_PARAM) -Wl,-rpath,.
 
 OBJECTS_DEBUG:=$(patsubst src/%.cpp,obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -113,7 +113,7 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/
 	else\
 		mkdir -p $(dir $@);\
 	fi
-	$(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG) $(addprefix -L, $(addsuffix lib-debug, $(LINK_PATHS))) $(addprefix -l, $(LINK_LIBRARIES))
+	$(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG)
 
 lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/
 	if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
diff --git a/tniceprint/makefile.conf b/tniceprint/makefile.conf
index c7558dd076ae8acfe60fd40b9b9d878602d369cf..e58b353a8de88ebb52ad81ce5ff0f370d4725178 100644
--- a/tniceprint/makefile.conf
+++ b/tniceprint/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=atniceprint
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+LINK_PATHS=../alib2cli/ ../alib2elgo/ ../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2cli alib2elgo alib2algo alib2str alib2data alib2common alib2std xml2
 INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/