[Spread-cvs] commit: r313 - in trunk: daemon libspread stdutil/src

[jonathan at spread.org]

Author: jonathan
Date: 2006-02-20 22:48:05 -0500 (Mon, 20 Feb 2006)
New Revision: 313

Modified:
   trunk/daemon/Makefile.in
   trunk/libspread/Makefile.in
   trunk/stdutil/src/Makefile.in
Log:
Fix errors in build integration resulting from new stdutil build.
Explicitly link with stdutil-threaded-release library. 
Make sure stdutil/src/Makefile creates the '../lib' directory before copying libraries into it.


Modified: trunk/daemon/Makefile.in
===================================================================
--- trunk/daemon/Makefile.in	2006-02-21 02:34:23 UTC (rev 312)
+++ trunk/daemon/Makefile.in	2006-02-21 03:48:05 UTC (rev 313)
@@ -72,8 +72,8 @@
 #y.tab.c:        config_parse.y
 #	$(YACC) -d config_parse.y
 
-spread$(EXEEXT): $(SPREADOBJS) ../stdutil/lib/libstdutil.a
-	$(LD) -o $@ $(SPREADOBJS) ../stdutil/lib/libstdutil.a $(LDFLAGS) $(LIBS)
+spread$(EXEEXT): $(SPREADOBJS) ../stdutil/lib/libstdutil-threaded-release.a
+	$(LD) -o $@ $(SPREADOBJS) ../stdutil/lib/libstdutil-threaded-release.a $(LDFLAGS) $(LIBS)
 
 spmonitor$(EXEEXT): $(MONITOR_OBJS)
 	$(LD) -o $@ $(MONITOR_OBJS) $(LDFLAGS) $(LIBS) 

Modified: trunk/libspread/Makefile.in
===================================================================
--- trunk/libspread/Makefile.in	2006-02-21 02:34:23 UTC (rev 312)
+++ trunk/libspread/Makefile.in	2006-02-21 03:48:05 UTC (rev 313)
@@ -141,14 +141,14 @@
 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread-core.so.$(LIBVERSION) libtspread-core.so)
 
 # Full Spread library with Fl_, SP_, and support modules linked in
-libspread.a: $(LIBTFL_OBJS) ../stdutil/lib/libstdutil.a
+libspread.a: $(LIBTFL_OBJS) ../stdutil/lib/libstdutil-threaded-release.a
 	$(AR) rv $@ $(LIBTFL_OBJS)
-	$(AR) xo ../stdutil/lib/libstdutil.a
-	$(AR) rv $@ std*.o
+	$(AR) xo ../stdutil/lib/libstdutil-threaded-release.a
+	$(AR) rv $@ std*.to
 	$(RANLIB) $@
 
 libspread.dylib:	$(LIBTFL_SHOBJS)
-	$(SHLD) -o libspread.$(LIBVERSION).dylib $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
+	$(SHLD) -o libspread.$(LIBVERSION).dylib $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil-threaded-release.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
 	$(SOFTLINK) -f libspread.$(LIBVERSION).dylib $@
 
 install-libspread.dylib:	libspread.dylib
@@ -156,7 +156,7 @@
 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib)
 
 libspread.so:	$(LIBTFL_SHOBJS)
-	$(SHLD) -o $@ $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
+	$(SHLD) -o $@ $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil-threaded-release.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
 
 install-libspread.so:	libspread.so
 	$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)

Modified: trunk/stdutil/src/Makefile.in
===================================================================
--- trunk/stdutil/src/Makefile.in	2006-02-21 02:34:23 UTC (rev 312)
+++ trunk/stdutil/src/Makefile.in	2006-02-21 03:48:05 UTC (rev 313)
@@ -1,4 +1,5 @@
 .SUFFIXES: .do .to .tdo .lo .ldo .lto .ltdo
+.PHONY: all standard libdir clean distclean uberclean
 
 LIBVERSION=1.0
 
@@ -68,12 +69,12 @@
 ALLTARGETS=$(STATIC_LIBS) @SHARED_LIBS@
 
 ########################################### BUILD RULES ########################################
-standard: $(LIB_DIR) @STANDARD_LIBS@
+standard: libdir @STANDARD_LIBS@
 
-all: $(LIB_DIR) $(ALLTARGETS)
+all: libdir $(ALLTARGETS)
 
-$(LIB_DIR):
-	$(buildtoolsdir)/mkinstalldirs $(LIB_DIR)
+libdir:
+	$(buildtoolsdir)/mkinstalldirs $(LIBDIR)
 
 $(STATIC_NOTHREAD_RELEASE_LIB): $(STATIC_NOTHREAD_RELEASE_OBJS)
 	$(AR) rvs $@ $(STATIC_NOTHREAD_RELEASE_OBJS)