diff options
| author | Roland McGrath <roland@gnu.org> | 2002-03-12 03:00:58 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-03-12 03:00:58 +0000 |
| commit | fd7075da38b18931b3e6027bd6881f1c0966f86c (patch) | |
| tree | 5066ac2563e17374cc461f88ec1c5159ad3a8f38 | |
| parent | 428b7ea22f1199a9c7a8c0c3972a676eeb135cfa (diff) | |
2002-03-11 Roland McGrath <roland@frob.com>
* 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.
| -rw-r--r-- | Makeconf | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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 |