diff --git a/src/makefile.c b/src/makefile.c index 388fedf..ac0ef95 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -350,12 +350,12 @@ static int _variables_targets_library(Configure * configure, FILE * fp, return 1; if(configure->os == HO_MACOSX) fprintf(fp, " %s%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", target, - ".a $(OBJDIR)", soname, " ", target, ".0", - soext, " ", target, soext); + ".a $(OBJDIR)", soname, " $(OBJDIR)", target, + ".0", soext, " $(OBJDIR)", target, soext); else fprintf(fp, " %s%s%s%s%s%s%s%s%s", "$(OBJDIR)", target, - ".a $(OBJDIR)", soname, ".0 ", soname, " ", - target, soext); + ".a $(OBJDIR)", soname, ".0 $(OBJDIR)", soname, + " $(OBJDIR)", target, soext); string_delete(soname); return 0; } @@ -1164,12 +1164,12 @@ static int _target_library(Configure * configure, FILE * fp, return 1; if(configure->os != HO_MACOSX) fprintf(fp, "\n%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", soname, - ".0 ", soname, " ", target, soext, ": $(", - target, "_OBJS)"); + ".0 $(OBJDIR)", soname, " $(OBJDIR)", target, + soext, ": $(", target, "_OBJS)"); else fprintf(fp, "\n%s%s%s%s%s%s%s%s%s%s%s%s", "$(OBJDIR)", soname, - " ", target, ".0", soext, " ", target, soext, - ": $(", target, "_OBJS)"); + " $(OBJDIR)", target, ".0", soext, " $(OBJDIR)", + target, soext, ": $(", target, "_OBJS)"); if((p = config_get(configure->config, target, "depends")) != NULL) fprintf(fp, " %s", p); fputc('\n', fp); diff --git a/tests/library/Makefile.Darwin b/tests/library/Makefile.Darwin index b03d5d7..a9e89ca 100644 --- a/tests/library/Makefile.Darwin +++ b/tests/library/Makefile.Darwin @@ -1,4 +1,4 @@ -TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.0.0.dylib libtest.0.dylib libtest.dylib +TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(OBJDIR)libtest.dylib OBJDIR = PREFIX = /usr/local DESTDIR = @@ -22,7 +22,7 @@ $(OBJDIR)libtest.a: $(libtest_OBJS) $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS) $(RANLIB) $(OBJDIR)libtest.a -$(OBJDIR)libtest.0.0.dylib libtest.0.dylib libtest.dylib: $(libtest_OBJS) +$(OBJDIR)libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(OBJDIR)libtest.dylib: $(libtest_OBJS) $(CCSHARED) -o $(OBJDIR)libtest.0.0.dylib -install_name $(LIBDIR)/libtest.0.dylib $(libtest_OBJS) $(libtest_LDFLAGS) $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.dylib diff --git a/tests/library/Makefile.NetBSD b/tests/library/Makefile.NetBSD index 0c40764..0c7b1d9 100644 --- a/tests/library/Makefile.NetBSD +++ b/tests/library/Makefile.NetBSD @@ -1,4 +1,4 @@ -TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.so.0.0 libtest.so.0 libtest.so +TARGETS = $(OBJDIR)libtest.a $(OBJDIR)libtest.so.0.0 $(OBJDIR)libtest.so.0 $(OBJDIR)libtest.so OBJDIR = PREFIX = /usr/local DESTDIR = @@ -22,7 +22,7 @@ $(OBJDIR)libtest.a: $(libtest_OBJS) $(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS) $(RANLIB) $(OBJDIR)libtest.a -$(OBJDIR)libtest.so.0.0 libtest.so.0 libtest.so: $(libtest_OBJS) +$(OBJDIR)libtest.so.0.0 $(OBJDIR)libtest.so.0 $(OBJDIR)libtest.so: $(libtest_OBJS) $(CCSHARED) -o $(OBJDIR)libtest.so.0.0 -Wl,-soname,libtest.so.0 $(libtest_OBJS) $(libtest_LDFLAGS) $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0 $(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so