From 72ed66152c463c4b5786cbcdb4523896c03cfb0a Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Tue, 12 Sep 2017 15:51:02 +0200 Subject: [PATCH] fix dependencies and their handling --- aarbology2/makefile.conf | 4 ++-- acast2/makefile.conf | 6 +++--- acompaction2/makefile.conf | 4 ++-- aconversions2/makefile.conf | 4 ++-- aderivation2/makefile.conf | 4 ++-- adeterminize2/makefile.conf | 4 ++-- aepsilon2/makefile.conf | 4 ++-- agenerate2/makefile.conf | 4 ++-- aintegral2/makefile.conf | 4 ++-- alangop2/makefile.conf | 4 ++-- aminimize2/makefile.conf | 4 ++-- anormalize2/makefile.conf | 4 ++-- aquery2/makefile.conf | 4 ++-- arand2/makefile.conf | 4 ++-- arename2/makefile.conf | 4 ++-- areverse2/makefile.conf | 4 ++-- arun2/makefile.conf | 4 ++-- astat2/makefile.conf | 4 ++-- astringology2/makefile.conf | 4 ++-- atrim2/makefile.conf | 4 ++-- makefile-library | 6 +++--- tniceprint/makefile.conf | 4 ++-- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/aarbology2/makefile.conf b/aarbology2/makefile.conf index 831715705f..5ada1c8807 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 74693944a9..1dc893db80 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 9981fe67f3..8dd4c0f398 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 b02ee8d1f9..40c3b813b6 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 ba3ff620a5..67c50ae125 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 5f6a1dcdc7..020e07e7f3 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 d8c96e7b40..ed5d5f4f8a 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 5cd7072694..dff9303bc8 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 c0f567bf65..891a6e9eb1 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 abc88450c8..d17072d5dd 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 eba256abe1..f22c79fd37 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 f5f02c777b..037040337f 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 06e0b01dbc..a422f5ec0d 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 0abaa7509b..028803f954 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 b879449cde..52d0722bd1 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 963a354de8..d419b2776f 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 6cf62b7b59..9eada94443 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 1123c5e210..7c39c67922 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 e37acf3fea..dcceb9e6ee 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 6874155da5..c732a116c6 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 63ef60e14f..09aaeb9308 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 c7558dd076..e58b353a8d 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/ -- GitLab