[Spread-cvs] commit: r267 - in trunk: . libspread
jonathan at spread.org
jonathan at spread.org
Wed Aug 17 18:30:48 EDT 2005
Author: jonathan
Date: 2005-08-17 18:30:48 -0400 (Wed, 17 Aug 2005)
New Revision: 267
Modified:
trunk/configure
trunk/configure.in
trunk/libspread/Makefile.in
Log:
Remove configure.in build of flush/Makefile as it no longer exists.
Add additional linker commands to build of libtspread.so so stdutil is included.
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-08-16 20:26:52 UTC (rev 266)
+++ trunk/configure 2005-08-17 22:30:48 UTC (rev 267)
@@ -8924,6 +8924,8 @@
SHLD="$CC -dynamiclib"
SHLDFLAGS="$SHLDFLAGS $LDFLAGS"
SHLIBS=$LIBS
+ SHLDCONVERTSTATIC="-Wl,-whole-archive"
+ SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
LIBSPSO="libspread.dylib"
LIBTSPSO="libtspread.dylib"
;;
@@ -8938,6 +8940,8 @@
SHLD="$CC -shared"
SHLDFLAGS="$SHLDFLAGS $LDFLAGS"
SHLIBS=$LIBS
+ SHLDCONVERTSTATIC="-Wl,-whole-archive"
+ SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
LIBSPSO="libspread.so"
LIBTSPSO="libtspread.so"
;;
@@ -8952,7 +8956,7 @@
- ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile libspread/Makefile examples/Makefile flush/Makefile"
+ ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile libspread/Makefile examples/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -9483,7 +9487,6 @@
"docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"libspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES libspread/Makefile" ;;
"examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
- "flush/Makefile" ) CONFIG_FILES="$CONFIG_FILES flush/Makefile" ;;
"daemon/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS daemon/config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-08-16 20:26:52 UTC (rev 266)
+++ trunk/configure.in 2005-08-17 22:30:48 UTC (rev 267)
@@ -670,6 +670,8 @@
SHLD="$CC -dynamiclib"
SHLDFLAGS="$SHLDFLAGS $LDFLAGS"
SHLIBS=$LIBS
+ SHLDCONVERTSTATIC="-Wl,-whole-archive"
+ SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
LIBSPSO="libspread.dylib"
LIBTSPSO="libtspread.dylib"
;;
@@ -684,6 +686,8 @@
SHLD="$CC -shared"
SHLDFLAGS="$SHLDFLAGS $LDFLAGS"
SHLIBS=$LIBS
+ SHLDCONVERTSTATIC="-Wl,-whole-archive"
+ SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
LIBSPSO="libspread.so"
LIBTSPSO="libtspread.so"
;;
@@ -698,7 +702,7 @@
AC_SUBST(LIBSPSO)
AC_SUBST(LIBTSPSO)
-AC_OUTPUT(Makefile daemon/Makefile docs/Makefile libspread/Makefile examples/Makefile flush/Makefile)
+AC_OUTPUT(Makefile daemon/Makefile docs/Makefile libspread/Makefile examples/Makefile)
# Print summary of options
Modified: trunk/libspread/Makefile.in
===================================================================
--- trunk/libspread/Makefile.in 2005-08-16 20:26:52 UTC (rev 266)
+++ trunk/libspread/Makefile.in 2005-08-17 22:30:48 UTC (rev 267)
@@ -54,6 +54,8 @@
SHCPPFLAGS=@SHCPPFLAGS@ -I$(top_srcdir)/daemon -I../daemon -I$(top_srcdir)/include $(FLUSH_INC_DIR)
SHLDFLAGS=@SHLDFLAGS@
SHLIBS=@SHLIBS@
+SHLDCONVERTSTATIC=@SHLDCONVERTSTATIC@
+SHLDCONVERTSTATICEND=@SHLDCONVERTSTATICEND@
RANLIB=@RANLIB@
INSTALL=@INSTALL@
SOFTLINK=@LN_S@
@@ -146,7 +148,7 @@
$(RANLIB) $@
libtspread.dylib: $(LIBTFL_SHOBJS)
- $(SHLD) -o libtspread.$(LIBVERSION).dylib $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
+ $(SHLD) -o libtspread.$(LIBVERSION).dylib $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
$(SOFTLINK) -f libtspread.$(LIBVERSION).dylib $@
install-libtspread.dylib: libtspread.dylib
@@ -154,7 +156,7 @@
(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib)
libtspread.so: $(LIBTFL_SHOBJS)
- $(SHLD) -o $@ $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
+ $(SHLD) -o $@ $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
install-libtspread.so: libtspread.so
$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
More information about the Spread-cvs
mailing list