From bbff942d359018aedcaf9d981d25d5b12594d1ad Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 21 May 2015 01:52:44 +0200 Subject: [PATCH] Do not link to libraries before being built --- src/makefile.c | 15 ++++++++------- tests/library/Makefile.Darwin | 4 ++-- tests/library/Makefile.Linux | 4 ++-- tests/library/Makefile.NetBSD | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/makefile.c b/src/makefile.c index aace058..0fe2987 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -1260,22 +1260,23 @@ static int _target_library(Configure * configure, FILE * fp, _makefile_print(fp, "%c", '\n'); if(configure->os == HO_MACOSX) { - _makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", target, ".0", - soext, ":\n"); + _makefile_print(fp, "%s%s%s%s%s%s%s", "\n$(OBJDIR)", target, + ".0", soext, ": $(OBJDIR)", soname, "\n"); _makefile_print(fp, "%s%s%s%s%s%s%s", "\t$(LN) -s -- ", soname, " $(OBJDIR)", target, ".0", soext, "\n"); - _makefile_print(fp, "%s%s%s%s", "\n$(OBJDIR)", target, soext, - ":\n"); + _makefile_print(fp, "%s%s%s%s%s%s", "\n$(OBJDIR)", target, + soext, ": $(OBJDIR)", soname, "\n"); _makefile_print(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname, " $(OBJDIR)", target, soext, "\n"); } else if(configure->os != HO_WIN32) { - _makefile_print(fp, "%s%s%s", "\n$(OBJDIR)", soname, ":\n"); + _makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", soname, + ": $(OBJDIR)", soname, ".0\n"); _makefile_print(fp, "%s%s%s%s%s", "\t$(LN) -s -- ", soname, ".0 $(OBJDIR)", soname, "\n"); - _makefile_print(fp, "%s%s%s%s", "\n$(OBJDIR)", target, soext, - ":\n"); + _makefile_print(fp, "%s%s%s%s%s%s", "\n$(OBJDIR)", target, + soext, ": $(OBJDIR)", soname, ".0\n"); _makefile_print(fp, "%s%s%s%s%s%s", "\t$(LN) -s -- ", soname, ".0 $(OBJDIR)", target, soext, "\n"); } diff --git a/tests/library/Makefile.Darwin b/tests/library/Makefile.Darwin index bad797f..7f623be 100644 --- a/tests/library/Makefile.Darwin +++ b/tests/library/Makefile.Darwin @@ -26,10 +26,10 @@ $(OBJDIR)libtest.a: $(libtest_OBJS) $(OBJDIR)libtest.0.0.dylib: $(libtest_OBJS) $(CCSHARED) -o $(OBJDIR)libtest.0.0.dylib -install_name $(LIBDIR)/libtest.0.dylib $(libtest_OBJS) $(libtest_LDFLAGS) -$(OBJDIR)libtest.0.dylib: +$(OBJDIR)libtest.0.dylib: $(OBJDIR)libtest.0.0.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.0.dylib -$(OBJDIR)libtest.dylib: +$(OBJDIR)libtest.dylib: $(OBJDIR)libtest.0.0.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.dylib $(OBJDIR)test.o: test.c diff --git a/tests/library/Makefile.Linux b/tests/library/Makefile.Linux index c11a05e..b41e498 100644 --- a/tests/library/Makefile.Linux +++ b/tests/library/Makefile.Linux @@ -26,10 +26,10 @@ $(OBJDIR)libtest.a: $(libtest_OBJS) $(OBJDIR)libtest.so.0.0: $(libtest_OBJS) $(CCSHARED) -o $(OBJDIR)libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS) -$(OBJDIR)libtest.so.0: +$(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0 -$(OBJDIR)libtest.so: +$(OBJDIR)libtest.so: $(OBJDIR)libtest.so.0.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so $(OBJDIR)test.o: test.c diff --git a/tests/library/Makefile.NetBSD b/tests/library/Makefile.NetBSD index 24f601d..fdcffc7 100644 --- a/tests/library/Makefile.NetBSD +++ b/tests/library/Makefile.NetBSD @@ -26,10 +26,10 @@ $(OBJDIR)libtest.a: $(libtest_OBJS) $(OBJDIR)libtest.so.0.0: $(libtest_OBJS) $(CCSHARED) -o $(OBJDIR)libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS) -$(OBJDIR)libtest.so.0: +$(OBJDIR)libtest.so.0: $(OBJDIR)libtest.so.0.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0 -$(OBJDIR)libtest.so: +$(OBJDIR)libtest.so: $(OBJDIR)libtest.so.0.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so $(OBJDIR)test.o: test.c