summaryrefslogtreecommitdiff
path: root/libstore/Makefile
diff options
context:
space:
mode:
authorJeremie Koenig <jk@jk.fr.eu.org>2010-08-16 13:51:21 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2010-08-18 01:06:28 +0200
commit6fa2f65fa28c0eebb736108d55b723e1a207c243 (patch)
tree48b3f1020804d9069a9e741b29d4821fda1678a1 /libstore/Makefile
parenta6bb3e62109c72ec912d264418c5e9b95c780dbf (diff)
Fix the build system to handle part stores
Part stores are used for debian-installer, and they're considered more elegant than kernel partition devices. This patch makes sure they're included in the build unless the user disables them explicitely. * Makeconf: add $(PARTED_LIBS) to static binaries which use libstore_part.a. * configure.in: look for libparted again (see also 7c7a04eb). * libstore/Makefile (store-types): include the 'part' store type when appropriate, remove the previous attempt. Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
Diffstat (limited to 'libstore/Makefile')
-rw-r--r--libstore/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/libstore/Makefile b/libstore/Makefile
index b1172c6a..56c1fdfd 100644
--- a/libstore/Makefile
+++ b/libstore/Makefile
@@ -28,6 +28,10 @@ SRCS = create.c derive.c make.c rdwr.c set.c \
open.c xinl.c typed.c map.c url.c unknown.c \
stripe.c $(filter-out ileave.c concat.c,$(store-types:=.c))
+# This has to be evaluated after config.make has been included;
+# as a consequence, using 'ifneq' or similar is not an option.
+maybe_part = $(and $(PARTED_LIBS),part)
+
store-types = \
bunzip2 \
concat \
@@ -40,16 +44,12 @@ store-types = \
module \
mvol \
nbd \
+ $(maybe_part) \
remap \
task \
zero
-ifeq (HAVE_PARTED,yes)
-store-types += part
-libstore.so-LDLIBS += -lparted
-endif
-
-libstore.so-LDLIBS += -ldl
+libstore.so-LDLIBS += $(PARTED_LIBS) -ldl
LCLHDRS=store.h
installhdrs=store.h