From 08a54f65c4ff9993c149cc73183c8584837ed8be Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 21 May 2015 01:42:28 +0200
Subject: [PATCH] Build libraries reliably with multiple jobs

---
 src/makefile.c                | 23 +++++++++++++----------
 tests/library/Makefile.Darwin |  6 +++++-
 tests/library/Makefile.Linux  |  6 +++++-
 tests/library/Makefile.NetBSD |  6 +++++-
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/makefile.c b/src/makefile.c
index 1a5c639..aace058 100644
--- a/src/makefile.c
+++ b/src/makefile.c
@@ -1222,18 +1222,14 @@ static int _target_library(Configure * configure, FILE * fp,
 	if(soname == NULL)
 		return 1;
 	if(configure->os == HO_MACOSX)
-		_makefile_print(fp, "%s%s%s%s%s%s%s%s%s%s%s%s",
-				"\n$(OBJDIR)", soname, " $(OBJDIR)", target,
-				".0", soext, " $(OBJDIR)", target, soext,
-				": $(", target, "_OBJS)");
+		_makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", soname, ": $(",
+				target, "_OBJS)");
 	else if(configure->os == HO_WIN32)
-		_makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", soname,
-				": $(", target, "_OBJS)");
+		_makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", soname, ": $(",
+				target, "_OBJS)");
 	else
-		_makefile_print(fp, "%s%s%s%s%s%s%s%s%s%s",
-				"\n$(OBJDIR)", soname, ".0 $(OBJDIR)", soname,
-				" $(OBJDIR)", target, soext, ": $(", target,
-				"_OBJS)");
+		_makefile_print(fp, "%s%s%s%s%s", "\n$(OBJDIR)", soname,
+				".0: $(", target, "_OBJS)");
 	if((p = config_get(configure->config, target, "depends")) != NULL)
 		_makefile_print(fp, " %s", p);
 	/* build the shared library */
@@ -1264,15 +1260,22 @@ 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", "\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", "\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", "\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", "\t$(LN) -s -- ", soname,
 				".0 $(OBJDIR)", target, soext, "\n");
 	}
diff --git a/tests/library/Makefile.Darwin b/tests/library/Makefile.Darwin
index 6d2292f..bad797f 100644
--- a/tests/library/Makefile.Darwin
+++ b/tests/library/Makefile.Darwin
@@ -23,9 +23,13 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
 	$(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
 	$(RANLIB) $(OBJDIR)libtest.a
 
-$(OBJDIR)libtest.0.0.dylib $(OBJDIR)libtest.0.dylib $(OBJDIR)libtest.dylib: $(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:
 	$(LN) -s -- libtest.0.0.dylib $(OBJDIR)libtest.0.dylib
+
+$(OBJDIR)libtest.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 ae99aab..c11a05e 100644
--- a/tests/library/Makefile.Linux
+++ b/tests/library/Makefile.Linux
@@ -23,9 +23,13 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
 	$(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
 	$(RANLIB) $(OBJDIR)libtest.a
 
-$(OBJDIR)libtest.so.0.0 $(OBJDIR)libtest.so.0 $(OBJDIR)libtest.so: $(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:
 	$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0
+
+$(OBJDIR)libtest.so:
 	$(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 82ffaab..24f601d 100644
--- a/tests/library/Makefile.NetBSD
+++ b/tests/library/Makefile.NetBSD
@@ -23,9 +23,13 @@ $(OBJDIR)libtest.a: $(libtest_OBJS)
 	$(AR) -rc $(OBJDIR)libtest.a $(libtest_OBJS)
 	$(RANLIB) $(OBJDIR)libtest.a
 
-$(OBJDIR)libtest.so.0.0 $(OBJDIR)libtest.so.0 $(OBJDIR)libtest.so: $(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:
 	$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so.0
+
+$(OBJDIR)libtest.so:
 	$(LN) -s -- libtest.so.0.0 $(OBJDIR)libtest.so
 
 $(OBJDIR)test.o: test.c