[Spread-cvs] commit: r279 - in trunk: . docs examples libspread
jonathan at spread.org
jonathan at spread.org
Wed Sep 21 01:00:31 EDT 2005
Author: jonathan
Date: 2005-09-21 01:00:31 -0400 (Wed, 21 Sep 2005)
New Revision: 279
Modified:
trunk/Makefile.in
trunk/configure
trunk/configure.in
trunk/docs/Makefile.in
trunk/examples/Makefile.in
trunk/libspread/Makefile.in
Log:
Fix 'make install' target. Inspiration by Neil Conway's patch for install.
Also change default spread library (with FL interface) to libspread. libtspread.* does not exist any
more. The basic libspread is now threadsafe. The core libraries (libspread-core and libtspread-core)
still exist as a single-threaded and a thread-safe version.
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2005-09-19 21:31:52 UTC (rev 278)
+++ trunk/Makefile.in 2005-09-21 05:00:31 UTC (rev 279)
@@ -10,7 +10,7 @@
( $(MAKE) -C $$dir clean); \
done
- rm -f config.cache config.log core
+ rm -f core
rm -rf autom4te.cache
distclean:
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-09-19 21:31:52 UTC (rev 278)
+++ trunk/configure 2005-09-21 05:00:31 UTC (rev 279)
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S YACC LEX AR PERL LD THLDFLAGS THLIBS EGREP SP_MAJOR_VERSION SP_MINOR_VERSION SP_PATCH_VERSION NROFF MANTYPE mansubdir piddir SHCC SHCFLAGS SHCPPFLAGS SHLD SHLDFLAGS SHLIBS LIBSPSO LIBTSPSO SHLDCONVERTSTATIC SHLDCONVERTSTATICEND LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S YACC LEX AR PERL LD THLDFLAGS THLIBS EGREP SP_MAJOR_VERSION SP_MINOR_VERSION SP_PATCH_VERSION NROFF MANTYPE mansubdir piddir SHCC SHCFLAGS SHCPPFLAGS SHLD SHLDFLAGS SHLIBS LIBSPSO LIBSPCORESO LIBTSPCORESO SHLDCONVERTSTATIC SHLDCONVERTSTATICEND LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -9017,7 +9017,8 @@
LIBSPSO=none
-LIBTSPSO=none
+LIBSPCORESO=none
+LIBTSPCORESO=none
case "$host" in
*-*-darwin*)
SHCC=$CC
@@ -9029,11 +9030,13 @@
SHLDCONVERTSTATIC=
SHLDCONVERTSTATICEND=
LIBSPSO="libspread.dylib"
- LIBTSPSO="libtspread.dylib"
+ LIBSPCORESO="libspread-core.dylib"
+ LIBTSPCORESO="libtspread-core.dylib"
;;
mips-sgi-irix*)
LIBSPSO=none
- LIBTSPSO=none
+ LIBSPCORESO=none
+ LIBTSPCORESO=none
;;
*-*-*)
SHCC=$CC
@@ -9045,7 +9048,8 @@
SHLDCONVERTSTATIC="-Wl,-whole-archive"
SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
LIBSPSO="libspread.so"
- LIBTSPSO="libtspread.so"
+ LIBSPCORESO="libspread-core.so"
+ LIBTSPCORESO="libtspread-core.so"
;;
esac
@@ -9060,6 +9064,7 @@
+
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
@@ -9721,7 +9726,8 @@
s, at SHLDFLAGS@,$SHLDFLAGS,;t t
s, at SHLIBS@,$SHLIBS,;t t
s, at LIBSPSO@,$LIBSPSO,;t t
-s, at LIBTSPSO@,$LIBTSPSO,;t t
+s, at LIBSPCORESO@,$LIBSPCORESO,;t t
+s, at LIBTSPCORESO@,$LIBTSPCORESO,;t t
s, at SHLDCONVERTSTATIC@,$SHLDCONVERTSTATIC,;t t
s, at SHLDCONVERTSTATICEND@,$SHLDCONVERTSTATICEND,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
@@ -10406,21 +10412,23 @@
F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}`
G=`eval echo ${piddir}` ; G=`eval echo ${G}`
H=`eval echo ${LIBSPSO}`; H=`eval echo ${H}`
-I=`eval echo ${LIBTSPSO}`; I=`eval echo ${I}`
+Hb=`eval echo ${LIBSPCORESO}`; Hb=`eval echo ${Hb}`
+I=`eval echo ${LIBTSPCORESO}`; I=`eval echo ${I}`
J=`eval echo ${includedir}`; J=`eval echo ${J}`
echo ""
echo "Spread has been configured with the following options:"
-echo " User binaries: $B"
-echo " System binaries: $C"
-echo " Configuration files: $D"
-echo " User libraries: $E"
-echo " Shared Spread Library: $H"
-echo "Shared Thread-safe Spread Library: $I"
-echo " Header files: $J"
-echo " Manual pages: $F"
-echo " PID file: $G"
-echo " Manpage format: $MANTYPE"
+echo " User binaries: $B"
+echo " System binaries: $C"
+echo " Configuration files: $D"
+echo " User libraries: $E"
+echo " Shared Spread Library: $H"
+echo " Shared Spread Core Library: $Hb"
+echo "Shared Thread-safe Spread Core Library: $I"
+echo " Header files: $J"
+echo " Manual pages: $F"
+echo " PID file: $G"
+echo " Manpage format: $MANTYPE"
echo ""
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-09-19 21:31:52 UTC (rev 278)
+++ trunk/configure.in 2005-09-21 05:00:31 UTC (rev 279)
@@ -663,7 +663,8 @@
AC_EXEEXT
LIBSPSO=none
-LIBTSPSO=none
+LIBSPCORESO=none
+LIBTSPCORESO=none
case "$host" in
*-*-darwin*)
SHCC=$CC
@@ -675,11 +676,13 @@
SHLDCONVERTSTATIC=
SHLDCONVERTSTATICEND=
LIBSPSO="libspread.dylib"
- LIBTSPSO="libtspread.dylib"
+ LIBSPCORESO="libspread-core.dylib"
+ LIBTSPCORESO="libtspread-core.dylib"
;;
mips-sgi-irix*)
LIBSPSO=none
- LIBTSPSO=none
+ LIBSPCORESO=none
+ LIBTSPCORESO=none
;;
*-*-*)
SHCC=$CC
@@ -691,7 +694,8 @@
SHLDCONVERTSTATIC="-Wl,-whole-archive"
SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
LIBSPSO="libspread.so"
- LIBTSPSO="libtspread.so"
+ LIBSPCORESO="libspread-core.so"
+ LIBTSPCORESO="libtspread-core.so"
;;
esac
@@ -702,7 +706,8 @@
AC_SUBST(SHLDFLAGS)
AC_SUBST(SHLIBS)
AC_SUBST(LIBSPSO)
-AC_SUBST(LIBTSPSO)
+AC_SUBST(LIBSPCORESO)
+AC_SUBST(LIBTSPCORESO)
AC_SUBST(SHLDCONVERTSTATIC)
AC_SUBST(SHLDCONVERTSTATICEND)
@@ -719,21 +724,23 @@
F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}`
G=`eval echo ${piddir}` ; G=`eval echo ${G}`
H=`eval echo ${LIBSPSO}`; H=`eval echo ${H}`
-I=`eval echo ${LIBTSPSO}`; I=`eval echo ${I}`
+Hb=`eval echo ${LIBSPCORESO}`; Hb=`eval echo ${Hb}`
+I=`eval echo ${LIBTSPCORESO}`; I=`eval echo ${I}`
J=`eval echo ${includedir}`; J=`eval echo ${J}`
echo ""
echo "Spread has been configured with the following options:"
-echo " User binaries: $B"
-echo " System binaries: $C"
-echo " Configuration files: $D"
-echo " User libraries: $E"
-echo " Shared Spread Library: $H"
-echo "Shared Thread-safe Spread Library: $I"
-echo " Header files: $J"
-echo " Manual pages: $F"
-echo " PID file: $G"
-echo " Manpage format: $MANTYPE"
+echo " User binaries: $B"
+echo " System binaries: $C"
+echo " Configuration files: $D"
+echo " User libraries: $E"
+echo " Shared Spread Library: $H"
+echo " Shared Spread Core Library: $Hb"
+echo "Shared Thread-safe Spread Core Library: $I"
+echo " Header files: $J"
+echo " Manual pages: $F"
+echo " PID file: $G"
+echo " Manpage format: $MANTYPE"
echo ""
Modified: trunk/docs/Makefile.in
===================================================================
--- trunk/docs/Makefile.in 2005-09-19 21:31:52 UTC (rev 278)
+++ trunk/docs/Makefile.in 2005-09-21 05:00:31 UTC (rev 279)
@@ -24,8 +24,8 @@
SOFTLINK=@LN_S@
PERL=@PERL@
-MANPAGES = SP_connect.3.out SP_disconnect.3.out SP_equal_group_ids.3.out SP_error.3.out SP_join.3.out SP_leave.3.out SP_multicast.3.out SP_multigroup_multicast.3.out SP_multigroup_scat_multicast.3.out SP_poll.3.out SP_receive.3.out SP_scat_multicast.3.out SP_scat_receive.3.out libsp.3.out spread.1.out spuser.1.out sptuser.1.out spmonitor.1.out spflooder.1.out
-MANPAGES_IN = SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 SP_error.3 SP_join.3 SP_leave.3 SP_multicast.3 SP_multigroup_multicast.3 SP_multigroup_scat_multicast.3 SP_poll.3 SP_receive.3 SP_scat_multicast.3 SP_scat_receive.3 libsp.3 spread.1 spuser.1 sptuser.1 spmonitor.1 spflooder.1
+MANPAGES = SP_connect.3.out SP_disconnect.3.out SP_equal_group_ids.3.out SP_error.3.out SP_join.3.out SP_leave.3.out SP_multicast.3.out SP_multigroup_multicast.3.out SP_multigroup_scat_multicast.3.out SP_poll.3.out SP_receive.3.out SP_scat_multicast.3.out SP_scat_receive.3.out SP_version.3.out libsp.3.out spread.1.out spuser.1.out sptuser.1.out spmonitor.1.out spflooder.1.out
+MANPAGES_IN = SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 SP_error.3 SP_join.3 SP_leave.3 SP_multicast.3 SP_multigroup_multicast.3 SP_multigroup_scat_multicast.3 SP_poll.3 SP_receive.3 SP_scat_multicast.3 SP_scat_receive.3 SP_version.3 libsp.3 spread.1 spuser.1 sptuser.1 spmonitor.1 spflooder.1
MANTYPE = @MANTYPE@
PATHSUBS = \
@@ -86,6 +86,10 @@
do \
$(INSTALL) -m 644 SP_$$page.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/SP_$$page.3; \
done
+ for page in connect disconnect error flush join leave more_msgs multicast poll receive scat_multicast scat_receive scat_subgroupcast scat_unicast subgroupcast unicast version; \
+ do \
+ $(INSTALL) -m 644 $(srcdir)/flush/man/FL_$$page.3 $(DESTDIR)$(mandir)/$(mansubdir)3/FL_$$page.3; \
+ done
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
fi
@@ -102,6 +106,7 @@
uninstall:
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/SP_*.3
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/FL_*.3
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/libsp.3
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/spread.1
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/spuser.1
Modified: trunk/examples/Makefile.in
===================================================================
--- trunk/examples/Makefile.in 2005-09-19 21:31:52 UTC (rev 278)
+++ trunk/examples/Makefile.in 2005-09-21 05:00:31 UTC (rev 279)
@@ -64,19 +64,19 @@
spflooder$(EXEEXT): $(SP_LIBRARY_DIR)/libspread-core.a flooder.o
$(LD) -o $@ flooder.o $(LDFLAGS) $(SP_LIBRARY_DIR)/libspread-core.a $(LIBS)
-sptuser$(EXEEXT): user.to $(SP_LIBRARY_DIR)/libtspread.a
- $(LD) $(THLDFLAGS) -o $@ user.to $(SP_LIBRARY_DIR)/libtspread.a $(LDFLAGS) $(LIBS) $(THLIBS)
+sptuser$(EXEEXT): user.to $(SP_LIBRARY_DIR)/libtspread-core.a
+ $(LD) $(THLDFLAGS) -o $@ user.to $(SP_LIBRARY_DIR)/libtspread-core.a $(LDFLAGS) $(LIBS) $(THLIBS)
spsimple_user$(EXEEXT): simple_user.o $(SP_LIBRARY_DIR)/libspread-core.a
$(LD) -o $@ simple_user.o $(LDFLAGS) $(SP_LIBRARY_DIR)/libspread-core.a $(LIBS)
-flush_user$(EXEEXT): $(SP_LIBRARY_DIR)/libtspread.a fl_user.to
- $(LD) $(LDFLAGS) -o flush_user fl_user.to $(SP_LIBRARY_DIR)/libtspread.a $(LIBS) $(THLIBS)
+flush_user$(EXEEXT): $(SP_LIBRARY_DIR)/libspread.a fl_user.to
+ $(LD) $(LDFLAGS) -o flush_user fl_user.to $(SP_LIBRARY_DIR)/libspread.a $(LIBS) $(THLIBS)
-sp_time_memb$(EXEEXT): $(SP_LIBRARY_DIR)/libflush.a sp_time_memb.o stats.o
+sp_time_memb$(EXEEXT): $(SP_LIBRARY_DIR)/libspread.a sp_time_memb.o stats.o
$(LD) $(LDFLAGS) -o sp_time_memb sp_time_memb.o stats.o $(LIBS)
-fl_time_memb$(EXEEXT): $(SP_LIBRARY_DIR)/libflush.a fl_time_memb.o stats.o
+fl_time_memb$(EXEEXT): $(SP_LIBRARY_DIR)/libspread.a fl_time_memb.o stats.o
$(LD) $(LDFLAGS) -o fl_time_memb fl_time_memb.o stats.o $(LIBS)
clean:
@@ -94,7 +94,7 @@
distprep:
autoreconf
-install: $(TARGETS) install-files install- at LIBSPSO@ install- at LIBTSPSO@
+install: $(TARGETS) install-files
install-files:
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(bindir)
Modified: trunk/libspread/Makefile.in
===================================================================
--- trunk/libspread/Makefile.in 2005-09-19 21:31:52 UTC (rev 278)
+++ trunk/libspread/Makefile.in 2005-09-21 05:00:31 UTC (rev 279)
@@ -65,8 +65,7 @@
SP_OBJ_DIR=../daemon
-TARGETS=libspread-core.a libtspread-core.a libtspread.a @LIBTSPSO@
-#TARGETS=libspread-core.a libtspread-core.a libtspread.a @LIBSPSO@ @LIBTSPSO@
+TARGETS=libspread-core.a libtspread-core.a libspread.a @LIBSPSO@ @LIBSPCORESO@ @LIBTSPCORESO@
LIBSP_OBJS= $(SP_OBJ_DIR)/alarm.o $(SP_OBJ_DIR)/events.o $(SP_OBJ_DIR)/memory.o sp.o
@@ -141,46 +140,59 @@
(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread-core.so.$(LIBVERSION) libtspread-core.so)
# Full Spread library with Fl_, SP_, and support modules linked in
-libtspread.a: $(LIBTFL_OBJS) ../stdutil/lib/libstdutil.a
+libspread.a: $(LIBTFL_OBJS) ../stdutil/lib/libstdutil.a
$(AR) rv $@ $(LIBTFL_OBJS)
$(AR) xo ../stdutil/lib/libstdutil.a
$(AR) rv $@ std*.o
$(RANLIB) $@
-libtspread.dylib: $(LIBTFL_SHOBJS)
- $(SHLD) -o libtspread.$(LIBVERSION).dylib $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
- $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib $@
+libspread.dylib: $(LIBTFL_SHOBJS)
+ $(SHLD) -o libspread.$(LIBVERSION).dylib $(LIBTFL_SHOBJS) $(SHLDFLAGS) $(SHLDCONVERTSTATIC) ../stdutil/lib/libstdutil.a $(SHLDCONVERTSTATICEND) $(SHLIBS) $(THLIBS)
+ $(SOFTLINK) -f libspread.$(LIBVERSION).dylib $@
-install-libtspread.dylib: libtspread.dylib
- $(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
- (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib)
+install-libspread.dylib: libspread.dylib
+ $(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/litspread.$(LIBVERSION).dylib
+ (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib)
-libtspread.so: $(LIBTFL_SHOBJS)
+libspread.so: $(LIBTFL_SHOBJS)
$(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)
- (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.so.$(LIBVERSION) libtspread.so)
+install-libspread.so: libspread.so
+ $(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
+ (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.so.$(LIBVERSION) libspread.so)
clean:
- rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS)
+ rm -f *.lo *.tlo *.to *.o *.a *.dylib *.so $(TARGETS)
rm -f core
rm -rf autom4te.cache
distclean: clean
rm -f Makefile config.status *~
-install: $(TARGETS) install-files install- at LIBSPSO@ install- at LIBTSPSO@
+install: $(TARGETS) install-files install- at LIBSPSO@ install- at LIBSPCORESO@ install- at LIBTSPCORESO@
install-files:
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(libdir)
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(includedir)
$(INSTALL) -m 644 libspread.a $(DESTDIR)$(libdir)/libspread.a
- $(INSTALL) -m 644 libtspread.a $(DESTDIR)$(libdir)/libtspread.a
+ $(INSTALL) -m 644 libspread-core.a $(DESTDIR)$(libdir)/libspread-core.a
+ $(INSTALL) -m 644 libtspread-core.a $(DESTDIR)$(libdir)/libtspread-core.a
+ $(INSTALL) -m 644 $(top_srcdir)/include/sp.h $(DESTDIR)$(includedir)/sp.h
+ $(INSTALL) -m 644 $(top_srcdir)/include/sp_func.h $(DESTDIR)$(includedir)/sp_func.h
+ $(INSTALL) -m 644 $(top_srcdir)/include/sp_events.h $(DESTDIR)$(includedir)/sp_events.h
+ $(INSTALL) -m 644 $(top_srcdir)/include/fl.h $(DESTDIR)$(includedir)/fl.h
uninstallall: uninstall
-rmdir $(DESTDIR)$(libdir)
uninstall:
-rm -f $(DESTDIR)$(libdir)/libspread.a
- -rm -f $(DESTDIR)$(libdir)/libtspread.a
+ -rm -f $(DESTDIR)$(libdir)/libspread-core.a
+ -rm -f $(DESTDIR)$(libdir)/libtspread-core.a
+ -rm -f $(DESTDIR)$(libdir)/@LIBSPSO@
+ -rm -f $(DESTDIR)$(libdir)/@LIBSPCORESO@
+ -rm -f $(DESTDIR)$(libdir)/@LIBTSPCORESO@
+ -rm -f $(DESTDIR)$(includedir)/sp.h
+ -rm -f $(DESTDIR)$(includedir)/sp_func.h
+ -rm -f $(DESTDIR)$(includedir)/sp_events.h
+ -rm -f $(DESTDIR)$(includedir)/fl.h
More information about the Spread-cvs
mailing list