diff options
| author | Jeremie Koenig <jk@jk.fr.eu.org> | 2010-08-16 13:51:21 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-18 01:06:28 +0200 |
| commit | 6fa2f65fa28c0eebb736108d55b723e1a207c243 (patch) | |
| tree | 48b3f1020804d9069a9e741b29d4821fda1678a1 /Makeconf | |
| parent | a6bb3e62109c72ec912d264418c5e9b95c780dbf (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 'Makeconf')
| -rw-r--r-- | Makeconf | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -325,7 +325,8 @@ $(progtarg): %$(target-suffix): $(BUGADDR) $(addsuffix .static,$(progtarg)): %$(target-suffix).static: $(BUGADDR) $(link-executable) -static \ '-Wl,-(' $(patsubst %.so,%.a,$^) $($*-LDLIBS) $(LDLIBS) \ - '-Wl,-)' + '-Wl,-)' \ + $(and $(filter %/libstore_part.a,$^), $(PARTED_LIBS)) endif # Just like above, but tell how to make .prof versions of programs. @@ -468,6 +469,7 @@ relink: # Tell make where to find other -l libraries that we use vpath libutil.% $(libdir)/ +# The libstore_%.a files fetch symbols from libstore.so ifneq ($(dir),libstore) $(boot-store-types:%=../libstore/libstore_%.a): ../libstore/libstore.so endif |