Allow (dynamic) libraries to depend on other libraries

4 files changed, 7 insertions, 1 deletions

diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile.new
index 3fd4fc7b21..ded112107f 100644
--- a/src/libexpr/Makefile.new
+++ b/src/libexpr/Makefile.new
@@ -7,6 +7,8 @@ libexpr_SOURCES = \
   get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \
   common-opts.cc names.cc
 
+libexpr_LIBS = libutil libstore libformat
+
 $(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y
 	bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d
 
diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new
index eed7e84afe..86323dbd48 100644
--- a/src/libmain/Makefile.new
+++ b/src/libmain/Makefile.new
@@ -4,4 +4,6 @@ libmain_DIR := $(d)
 
 libmain_SOURCES = shared.cc stack.cc
 
+libmain_LIBS = libstore libutil libformat
+
 libmain_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS)
diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile.new
index 0a384e0b1d..7d542d3123 100644
--- a/src/libstore/Makefile.new
+++ b/src/libstore/Makefile.new
@@ -6,6 +6,8 @@ libstore_SOURCES = \
   store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \
   globals.cc references.cc pathlocks.cc gc.cc optimise-store.cc
 
+libstore_LIBS = libutil libformat
+
 libstore_LDFLAGS = -lsqlite3 -lbz2
 
 libstore_CXXFLAGS = \
diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile.new
index b7dbf7d1d2..59670d2ce0 100644
--- a/src/libutil/Makefile.new
+++ b/src/libutil/Makefile.new
@@ -10,4 +10,4 @@ else
   libutil_SOURCES += md5.c sha1.c sha256.c
 endif
 
-libutil_LIBS = src/boost/format/libformat
+libutil_LIBS = libformat