diff --git a/alib2data/makefile.conf b/alib2data/makefile.conf index 17c24b551d3842f41f0e453dcb7d3e9f35cbd109..d6864ad2a9107073e652a610681b11a97442f852 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 a151fc81adff386f508076a5f9ae39266dd54749..dbaae33dfc443e170b9fbebce8cc09e2a91472ea 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 51853190d4c1a488e02adffd06469b9df81fe806..c6cdccb7d569a9c752cde45d6ff25a56ae745f4a 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 d7837275b4de654053fa42949cf1f03b7116b402..63ef60e14f40bfc0899f9673f72aea066b73e007 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\