From 8700070d436f3cb087bedcefd66770d465a96a4c Mon Sep 17 00:00:00 2001 From: Tomas Pecka <peckato1@fit.cvut.cz> Date: Tue, 29 Aug 2017 10:54:11 +0200 Subject: [PATCH] Library exports --- alib2data/makefile.conf | 2 +- alib2elgo/makefile.conf | 6 +++--- alib2std/makefile.conf | 4 ++-- makefile-library | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alib2data/makefile.conf b/alib2data/makefile.conf index 17c24b551d..d6864ad2a9 100644 --- a/alib2data/makefile.conf +++ b/alib2data/makefile.conf @@ -2,4 +2,4 @@ LIBRARY:=alib2data TESTBIN:=alib2test LINK_PATHS=../alib2common/ ../alib2std/ LINK_LIBRARIES=alib2common alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alib2elgo/makefile.conf b/alib2elgo/makefile.conf index a151fc81ad..dbaae33dfc 100644 --- a/alib2elgo/makefile.conf +++ b/alib2elgo/makefile.conf @@ -1,5 +1,5 @@ LIBRARY:=alib2elgo TESTBIN:=alib2test -LINK_PATHS=../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/ -LINK_LIBRARIES=alib2algo alib2data alib2common alib2std xml2 -INCLUDE_PATHS=\$$(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=../alib2algo/ ../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/ +LINK_LIBRARIES=alib2algo alib2str alib2data alib2common alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alib2std/makefile.conf b/alib2std/makefile.conf index 51853190d4..c6cdccb7d5 100644 --- a/alib2std/makefile.conf +++ b/alib2std/makefile.conf @@ -1,5 +1,5 @@ LIBRARY:=alib2std TESTBIN:=alib2test LINK_PATHS= -LINK_LIBRARIES= -INCLUDE_PATHS= +LINK_LIBRARIES=xml2 +INCLUDE_PATHS=/usr/include/libxml2/ diff --git a/makefile-library b/makefile-library index d7837275b4..63ef60e14f 100644 --- a/makefile-library +++ b/makefile-library @@ -113,7 +113,7 @@ lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/ else\ mkdir -p $(dir $@);\ fi - $(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG) + $(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG) $(addprefix -L, $(addsuffix lib-debug, $(LINK_PATHS))) $(addprefix -l, $(LINK_LIBRARIES)) lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/ if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ -- GitLab