[Spread-cvs] commit: r573 - in trunk: daemon libspread

[jonathan at spread.org]

Author: jonathan
Date: 2013-04-04 20:29:32 -0400 (Thu, 04 Apr 2013)
New Revision: 573

Modified:
   trunk/daemon/Changelog
   trunk/libspread/Makefile.in
Log:
Fix for error in paralle make of libspread. Reported by Johannes Wienke

Modified: trunk/daemon/Changelog
===================================================================
--- trunk/daemon/Changelog	2013-04-04 23:58:28 UTC (rev 572)
+++ trunk/daemon/Changelog	2013-04-05 00:29:32 UTC (rev 573)
@@ -1,3 +1,8 @@
+Thu Apr  4 20:25:58 2013  Jonathan Stanton  <jonathan at spreadconcepts.com>
+
+	* Makefile.in (install-files): Fix parallel make issue where 
+	installing libraries broke the build. Reported by Johannes Wienke.
+
 Wed Mar 27 23:43:00 2013  Jonathan Stanton  <jonathan at spreadconcepts.com>
 
 	* arch.h: Apply Windows portability fixes by Juan Pizzorno. 

Modified: trunk/libspread/Makefile.in
===================================================================
--- trunk/libspread/Makefile.in	2013-04-04 23:58:28 UTC (rev 572)
+++ trunk/libspread/Makefile.in	2013-04-05 00:29:32 UTC (rev 573)
@@ -127,7 +127,7 @@
 	$(SHLD) -o libspread-core.$(LIBFULLVERSION).dylib $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa $(SHLDCONVERTSTATICEND) $(SHLIBS) $(SHLDNAME)libspread-core.$(LIBVERSION).dylib  -current_version $(LIBFULLVERSION) -compatibility_version $(LIBCOMPATVERSION)
 	$(SOFTLINK) -f libspread-core.$(LIBFULLVERSION).dylib $@
 
-install-libspread-core.dylib:	libspread-core.dylib
+install-libspread-core.dylib:	libspread-core.dylib install-files
 	$(INSTALL) -m 0755 libspread-core.$(LIBFULLVERSION).dylib $(DESTDIR)$(libdir)/libspread-core.$(LIBFULLVERSION).dylib
 	(cd $(DESTDIR)$(libdir); \
 		$(SOFTLINK) -f libspread-core.$(LIBFULLVERSION).dylib libspread-core.dylib; \
@@ -138,7 +138,7 @@
 libspread-core.so:	$(LIBSP_SHOBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa
 	$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa $(SHLDCONVERTSTATICEND) $(SHLIBS) $(SHLDOPTION)$(SHLDNAME)$@.$(LIBVERSION)
 
-install-libspread-core.so:	libspread-core.so
+install-libspread-core.so:	libspread-core.so install-files
 	$(INSTALL) -m 0755 libspread-core.so $(DESTDIR)$(libdir)/libspread-core.so.$(LIBFULLVERSION)
 	(cd $(DESTDIR)$(libdir); \
 		$(SOFTLINK) -f libspread-core.so.$(LIBFULLVERSION) libspread-core.so; \
@@ -155,7 +155,7 @@
 	$(SHLD) -o libtspread-core.$(LIBFULLVERSION).dylib $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS) $(SHLDNAME)libtspread-core.$(LIBVERSION).dylib  -current_version $(LIBFULLVERSION) -compatibility_version $(LIBCOMPATVERSION)
 	$(SOFTLINK) -f libtspread-core.$(LIBFULLVERSION).dylib $@
 
-install-libtspread-core.dylib:	libtspread-core.dylib
+install-libtspread-core.dylib:	libtspread-core.dylib install-files
 	$(INSTALL) -m 0755 libtspread-core.$(LIBFULLVERSION).dylib $(DESTDIR)$(libdir)/libtspread-core.$(LIBFULLVERSION).dylib
 	(cd $(DESTDIR)$(libdir); \
 		$(SOFTLINK) -f libtspread-core.$(LIBFULLVERSION).dylib libtspread-core.dylib; \
@@ -166,7 +166,7 @@
 libtspread-core.so:	$(LIBTSP_SHOBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa
 	$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS) $(SHLDOPTION)$(SHLDNAME)$@.$(LIBVERSION)
 
-install-libtspread-core.so:	libtspread-core.so
+install-libtspread-core.so:	libtspread-core.so install-files
 	$(INSTALL) -m 0755 libtspread-core.so $(DESTDIR)$(libdir)/libtspread-core.so.$(LIBFULLVERSION)
 	(cd $(DESTDIR)$(libdir); \
 		$(SOFTLINK) -f libtspread-core.so.$(LIBFULLVERSION) libtspread-core.so; \
@@ -186,7 +186,7 @@
 	$(SHLD) -o libspread.$(LIBFULLVERSION).dylib $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil-threaded-release.a $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS) $(SHLDNAME)libspread.$(LIBVERSION).dylib  -current_version $(LIBFULLVERSION) -compatibility_version $(LIBCOMPATVERSION)
 	$(SOFTLINK) -f libspread.$(LIBFULLVERSION).dylib $@
 
-install-libspread.dylib:	libspread.dylib
+install-libspread.dylib:	libspread.dylib install-files
 	$(INSTALL) -m 0755 libspread.$(LIBFULLVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBFULLVERSION).dylib
 	(cd $(DESTDIR)$(libdir); \
 		$(SOFTLINK) -f libspread.$(LIBFULLVERSION).dylib libspread.dylib; \
@@ -197,7 +197,7 @@
 libspread.so:	$(LIBTFL_SHOBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa
 	$(SHLD) -o $@ $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHARED_STDUTIL) $(SHLDCONVERTSTATIC) $(LIBSPREADUTIL_DIR)/lib/libspread-util.sa $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS) $(SHLDOPTION)$(SHLDNAME)$@.$(LIBVERSION)
 
-install-libspread.so:	libspread.so
+install-libspread.so:	libspread.so install-files
 	$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBFULLVERSION)
 	(cd $(DESTDIR)$(libdir); \
 		$(SOFTLINK) -f libspread.so.$(LIBFULLVERSION) libspread.so; \