From fd7075da38b18931b3e6027bd6881f1c0966f86c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 12 Mar 2002 03:00:58 +0000 Subject: 2002-03-11 Roland McGrath * Makeconf ($(libname).so.$(hurd-version)): Include $($(libname).so-LDLIBS) and $(LDLIBS) in the link. * configure.in (--enable-boot-store-types): Grok this arg. * config.make.in (boot-store-types): New variable, set by it. * Makeconf [$(dir) != libstore] ($(boot-store-types:%=../libstore/libstore_%.a)): Make these targets depend on ../libstore/libstore.so. --- Makeconf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Makeconf') diff --git a/Makeconf b/Makeconf index b27cd480..caa39c8f 100644 --- a/Makeconf +++ b/Makeconf @@ -348,7 +348,10 @@ $(libname)_pic.a: $(patsubst %.o,%_pic.o,$(OBJS)) # we make that a symlink. $(libname).so.$(hurd-version): $(patsubst %.o,%_pic.o,$(OBJS)) $(library_deps) $(CC) -shared -Wl,-soname=$@ -o $@ \ - $(rpath) $(CFLAGS) $(LDFLAGS) $($(libname).so-LDFLAGS) $^ + $(rpath) $(CFLAGS) $(LDFLAGS) $($(libname).so-LDFLAGS) \ + '-Wl,-(' $^ $($(libname).so-LDLIBS) $(LDLIBS) \ + '-Wl,-)' + $(libname).so: $(libname).so.$(hurd-version) ln -f -s $< $@ endif @@ -453,6 +456,9 @@ relink: # Tell make where to find other -l libraries that we use vpath libutil.% $(libdir)/ +ifneq ($(dir),libstore) +$(boot-store-types:%=../libstore/libstore_%.a): ../libstore/libstore.so +endif # Default rules to build PIC object files. %_pic.o: %.c -- cgit v1.2.3