[Spread-cvs] commit: r259 - in trunk: . daemon flush stdutil/src
stdutil/src/stdutil/private
jonathan at spread.org
jonathan at spread.org
Sun Aug 7 18:54:26 EDT 2005
Author: jonathan
Date: 2005-08-07 18:54:26 -0400 (Sun, 07 Aug 2005)
New Revision: 259
Removed:
trunk/stdutil/src/stdutil/private/stdarch.h
Modified:
trunk/Makefile.in
trunk/configure
trunk/configure.in
trunk/daemon/Makefile.in
trunk/flush/Makefile.in
trunk/stdutil/src/Makefile.in
Log:
Merge build/Makefile/configure for flush with Spread. Also fixup integration with
stdutil build setup. Spread, Flush and Stdutil should build from a separate
directory tree now.
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2005-08-07 22:53:21 UTC (rev 258)
+++ trunk/Makefile.in 2005-08-07 22:54:26 UTC (rev 259)
@@ -1,4 +1,4 @@
-SUBDIRS=stdutil daemon docs examples
+SUBDIRS=stdutil/src daemon docs examples flush
all: $(SUBDIRS)
for dir in $(SUBDIRS); do \
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-08-07 22:53:21 UTC (rev 258)
+++ trunk/configure 2005-08-07 22:54:26 UTC (rev 259)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.59 for Spread 4.0.0beta1.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -265,13 +265,13 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='Spread'
+PACKAGE_TARNAME='spread'
+PACKAGE_VERSION='4.0.0beta1'
+PACKAGE_STRING='Spread 4.0.0beta1'
+PACKAGE_BUGREPORT=''
-ac_unique_file="daemon/spread.c"
+ac_subdirs_all="$ac_subdirs_all stdutil/src"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -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 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 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 LIBTSPSO LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -778,7 +778,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures Spread 4.0.0beta1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -838,7 +838,9 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of Spread 4.0.0beta1:";;
+ esac
cat <<\_ACEOF
Optional Packages:
@@ -958,6 +960,8 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+Spread configure 4.0.0beta1
+generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -970,7 +974,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by Spread $as_me 4.0.0beta1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1299,6 +1303,14 @@
+
+
+
+
+
+
+
+
ac_aux_dir=
for ac_dir in buildtools $srcdir/buildtools; do
if test -f $ac_dir/install-sh; then
@@ -1326,6 +1338,12 @@
ac_config_headers="$ac_config_headers daemon/config.h"
+
+
+
+subdirs="$subdirs stdutil/src"
+
+
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -3704,6 +3722,81 @@
+echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
+echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6
+if test "${ac_cv_lib_m_sqrt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char sqrt ();
+int
+main ()
+{
+sqrt ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_m_sqrt=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_m_sqrt=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
+echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6
+if test $ac_cv_lib_m_sqrt = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+ LIBS="-lm $LIBS"
+
+fi
+
+
+
for ac_func in strftime
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -4288,9 +4381,9 @@
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## --------------------------------- ##
+## Report this to the Spread lists. ##
+## --------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -8859,7 +8952,7 @@
- ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile examples/Makefile"
+ ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile examples/Makefile flush/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
@@ -9222,7 +9315,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by Spread $as_me 4.0.0beta1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9282,7 +9375,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+Spread config.status 4.0.0beta1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -9389,6 +9482,7 @@
"daemon/Makefile" ) CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
"docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/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;}
@@ -9474,6 +9568,7 @@
s, at ECHO_N@,$ECHO_N,;t t
s, at ECHO_T@,$ECHO_T,;t t
s, at LIBS@,$LIBS,;t t
+s, at subdirs@,$subdirs,;t t
s, at build@,$build,;t t
s, at build_cpu@,$build_cpu,;t t
s, at build_vendor@,$build_vendor,;t t
@@ -10012,7 +10107,184 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
+#
+# CONFIG_SUBDIRS section.
+#
+if test "$no_recursion" != yes; then
+ # Remove --cache-file and --srcdir arguments so they do not pile up.
+ ac_sub_configure_args=
+ ac_prev=
+ for ac_arg in $ac_configure_args; do
+ if test -n "$ac_prev"; then
+ ac_prev=
+ continue
+ fi
+ case $ac_arg in
+ -cache-file | --cache-file | --cache-fil | --cache-fi \
+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+ ac_prev=cache_file ;;
+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
+ | --c=*)
+ ;;
+ --config-cache | -C)
+ ;;
+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+ ac_prev=srcdir ;;
+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+ ;;
+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+ ac_prev=prefix ;;
+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+ ;;
+ *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+ esac
+ done
+
+ # Always prepend --prefix to ensure using the same prefix
+ # in subdir configurations.
+ ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
+
+ ac_popdir=`pwd`
+ for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
+
+ # Do not complain, so a configure script can configure whichever
+ # parts of a large source tree are present.
+ test -d $srcdir/$ac_dir || continue
+
+ { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
+echo "$as_me: configuring in $ac_dir" >&6;}
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
+ ac_builddir=.
+
+if test "$ac_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+
+ cd $ac_dir
+
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
+ ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
+ elif test -f $ac_srcdir/configure; then
+ ac_sub_configure="$SHELL '$ac_srcdir/configure'"
+ elif test -f $ac_srcdir/configure.in; then
+ ac_sub_configure=$ac_configure
+ else
+ { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+ ac_sub_configure=
+ fi
+
+ # The recursion is here.
+ if test -n "$ac_sub_configure"; then
+ # Make the cache file name correct relative to the subdirectory.
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
+ *) # Relative path.
+ ac_sub_cache_file=$ac_top_builddir$cache_file ;;
+ esac
+
+ { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+ # The eval makes quoting arguments work.
+ eval $ac_sub_configure $ac_sub_configure_args \
+ --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
+ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ cd $ac_popdir
+ done
+fi
+
+
# Print summary of options
# Someone please show me a better way :)
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-08-07 22:53:21 UTC (rev 258)
+++ trunk/configure.in 2005-08-07 22:54:26 UTC (rev 259)
@@ -1,7 +1,10 @@
-AC_INIT(daemon/spread.c)
+AC_INIT(Spread, 4.0.0beta1)
AC_CONFIG_AUX_DIR(buildtools)
AC_CONFIG_HEADER(daemon/config.h)
+
+AC_CONFIG_SUBDIRS(stdutil/src)
+
AC_CANONICAL_HOST
case "$host" in
@@ -95,6 +98,8 @@
AC_CHECK_LIB(nsl, gethostbyaddr, , )
AC_CHECK_LIB(socket, socket, , )
+AC_CHECK_LIB(m, sqrt)
+
AC_FUNC_STRFTIME
# Checks for header files.
@@ -693,7 +698,7 @@
AC_SUBST(LIBSPSO)
AC_SUBST(LIBTSPSO)
-AC_OUTPUT(Makefile daemon/Makefile docs/Makefile examples/Makefile)
+AC_OUTPUT(Makefile daemon/Makefile docs/Makefile examples/Makefile flush/Makefile)
# Print summary of options
Modified: trunk/daemon/Makefile.in
===================================================================
--- trunk/daemon/Makefile.in 2005-08-07 22:53:21 UTC (rev 258)
+++ trunk/daemon/Makefile.in 2005-08-07 22:54:26 UTC (rev 259)
@@ -33,9 +33,9 @@
CC=@CC@
LD=@LD@
CFLAGS=@CFLAGS@
-CPPFLAGS=-I. -I$(srcdir) -I$(top_srcdir)/include -I../stdutil/src @CPPFLAGS@ $(PATHS) @DEFS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
+CPPFLAGS=-I. -I$(srcdir) -I$(top_srcdir)/include -I../stdutil/src -I$(top_srcdir)/stdutil/src @CPPFLAGS@ $(PATHS) @DEFS@
+LDFLAGS=@LDFLAGS@
+LIBS=@LIBS@
THLDFLAGS=@THLDFLAGS@
THLIBS=@THLIBS@
AR=@AR@
@@ -63,11 +63,11 @@
LIBTSP_SHOBJS= alarm.tlo events.tlo memory.tlo sp.tlo
-SPREADOBJS= spread.o protocol.o session.o groups.o alarm.o events.o memory.o membership.o data_link.o network.o status.o log.o flow_control.o message.o lex.yy.o y.tab.o configuration.o skiplist.o acm.o acp-permit.o auth-null.o auth-ip.o
+SPREADOBJS= spread.o protocol.o session.o groups.o alarm.o events.o memory.o membership.o data_link.o network.o status.o log.o flow_control.o message.o lex.yy.o y.tab.o configuration.o acm.o acp-permit.o auth-null.o auth-ip.o
-MONITOR_OBJS= monitor.o alarm.o events.o memory.o data_link.o lex.yy.o y.tab.o configuration.o skiplist.o acm.o
+MONITOR_OBJS= monitor.o alarm.o events.o memory.o data_link.o lex.yy.o y.tab.o configuration.o acm.o
-TMONITOR_OBJS= monitor.to alarm.to events.to memory.to data_link.to lex.yy.to y.tab.to configuration.to skiplist.to acm.to
+TMONITOR_OBJS= monitor.to alarm.to events.to memory.to data_link.to lex.yy.to y.tab.to configuration.to acm.to
all: $(TARGETS)
@@ -143,8 +143,8 @@
$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.so.$(LIBVERSION) libtspread.so)
-spread$(EXEEXT): $(SPREADOBJS)
- $(LD) -o $@ $(SPREADOBJS) $(LDFLAGS) $(LIBS)
+spread$(EXEEXT): $(SPREADOBJS) ../stdutil/lib/libstdutil.a
+ $(LD) -o $@ $(SPREADOBJS) ../stdutil/lib/libstdutil.a $(LDFLAGS) $(LIBS)
spmonitor$(EXEEXT): $(MONITOR_OBJS)
$(LD) -o $@ $(MONITOR_OBJS) $(LDFLAGS) $(LIBS)
Modified: trunk/flush/Makefile.in
===================================================================
--- trunk/flush/Makefile.in 2005-08-07 22:53:21 UTC (rev 258)
+++ trunk/flush/Makefile.in 2005-08-07 22:54:26 UTC (rev 259)
@@ -1,12 +1,16 @@
CC=@CC@
AR=@AR@
-SP_INC_DIR = -I../include
-SP_LIB_DIR = -L../daemon
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+VPATH=@srcdir@
-STD_INC_DIR = -I../stdutil/src
-STD_LIB_DIR = -L../stdutil/lib
+SP_INC_DIR = -I$(top_srcdir)/include
+SP_LIB_DIR = -L$(top_srcdir)/daemon
+STD_INC_DIR = -I../stdutil/src -I$(top_srcdir)/stdutil/src
+STD_LIB_DIR = -L$(top_srcdir)/stdutil/lib
+
# use thread safe libs and enable std locking mechanisms (optional)
THREAD_SAFE = -D_REENTRANT
@@ -14,7 +18,7 @@
NO_DEBUG = -DNDEBUG
# libraries apps need to link with: pthreads (optional), flush, stdutil, spread
-LIBS = @LIBS@ $(TARGET_DIR)/libflush.a -ltspread -lstdutil
+LIBS = @LIBS@ $(TARGET_DIR)/libflush.a ../daemon/libtspread.a ../stdutil/lib/libstdutil.a -lpthread
# where to put the libraries (libflush.a, libstdutil.a, etc.) and exes
TARGET_DIR = .
@@ -24,7 +28,7 @@
DEFINES = $(THREAD_SAFE) $(NO_DEBUG) $(DO_TIMINGS)
# all the include directories
-INCLUDES = $(SP_INC_DIR) -I. -I../stdutil/src
+INCLUDES = $(SP_INC_DIR) -I. -I$(srcdir) $(STD_INC_DIR)
# all the library linkage diretories
LDFLAGS = $(SP_LIB_DIR)
@@ -32,7 +36,8 @@
# gcc specific compiler flags
CFLAGS = -Wall -O $(INCLUDES) $(DEFINES) # -g
-TARGETS = $(TARGET_DIR)/libflush.a $(APP_DIR)/flush_user $(APP_DIR)/sp_time_memb $(APP_DIR)/fl_time_memb
+TARGETS = $(TARGET_DIR)/libflush.a
+#TARGETS = $(TARGET_DIR)/libflush.a $(APP_DIR)/flush_user $(APP_DIR)/sp_time_memb $(APP_DIR)/fl_time_memb
OBJS = fl.o scatp.o
Modified: trunk/stdutil/src/Makefile.in
===================================================================
--- trunk/stdutil/src/Makefile.in 2005-08-07 22:53:21 UTC (rev 258)
+++ trunk/stdutil/src/Makefile.in 2005-08-07 22:54:26 UTC (rev 259)
@@ -1,6 +1,11 @@
CC=@CC@
AR=@AR@
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+VPATH=@srcdir@
+buildtoolsdir=$(top_srcdir)/../../buildtools
+
# where to put libraries and test/example programs
TARGET_DIR = ../lib
APP_DIR = ../bin
@@ -15,7 +20,7 @@
CFLAGS += -DSTDBOUNDS_CHECKS
# other flags
-CFLAGS += -fPIC -g -Wall -O2 -I ./
+CFLAGS += -fPIC -g -Wall -O2 -I. -I$(srcdir)
# add pthreads library if necessary
LIBS = @LIBS@
@@ -25,29 +30,32 @@
# targets
LIBSTDUTIL = $(TARGET_DIR)/libstdutil.a
-TESTS = $(APP_DIR)/stdarch_test $(APP_DIR)/stddll_test $(APP_DIR)/stdarr_test $(APP_DIR)/stdcarr_test $(APP_DIR)/stdhash_test
+TESTS = $(APP_DIR)/stddll_test $(APP_DIR)/stdarr_test $(APP_DIR)/stdcarr_test $(APP_DIR)/stdhash_test
TARGETS = $(LIBSTDUTIL) $(TESTS)
$(LIBSTDUTIL): $(OBJS)
+ $(buildtoolsdir)/mkinstalldirs $(TARGET_DIR)
$(AR) -rs $(LIBSTDUTIL) $(OBJS)
+$(APP_DIR):
+ $(buildtoolsdir)/mkinstalldirs $(APP_DIR)
+
tests: $(TESTS)
- $(APP_DIR)/stdarch_test
$(APP_DIR)/stddll_test
$(APP_DIR)/stdarr_test
$(APP_DIR)/stdcarr_test
$(APP_DIR)/stdhash_test
-$(APP_DIR)/stddll_test: $(LIBSTDUTIL) stdtest/stddll_test.c
+$(APP_DIR)/stddll_test: $(LIBSTDUTIL) $(APP_DIR) stdtest/stddll_test.c
$(CC) $(CFLAGS) -o $(APP_DIR)/stddll_test stdtest/stddll_test.c $(LIBSTDUTIL) $(LIBS)
-$(APP_DIR)/stdarr_test: $(APP_DIR)/stddll_test stdtest/stdarr_test.c
+$(APP_DIR)/stdarr_test: $(APP_DIR)/stddll_test $(APP_DIR) stdtest/stdarr_test.c
$(CC) $(CFLAGS) -o $(APP_DIR)/stdarr_test stdtest/stdarr_test.c $(LIBSTDUTIL) $(LIBS)
-$(APP_DIR)/stdcarr_test: $(APP_DIR)/stddll_test stdtest/stdcarr_test.c
+$(APP_DIR)/stdcarr_test: $(APP_DIR)/stddll_test $(APP_DIR) stdtest/stdcarr_test.c
$(CC) $(CFLAGS) -o $(APP_DIR)/stdcarr_test stdtest/stdcarr_test.c $(LIBSTDUTIL) $(LIBS)
-$(APP_DIR)/stdhash_test: $(LIBSTDUTIL) stdtest/stdhash_test.c
+$(APP_DIR)/stdhash_test: $(LIBSTDUTIL) $(APP_DIR) stdtest/stdhash_test.c
$(CC) $(CFLAGS) -o $(APP_DIR)/stdhash_test stdtest/stdhash_test.c $(LIBSTDUTIL) $(LIBS)
clean:
Deleted: trunk/stdutil/src/stdutil/private/stdarch.h
===================================================================
--- trunk/stdutil/src/stdutil/private/stdarch.h 2005-08-07 22:53:21 UTC (rev 258)
+++ trunk/stdutil/src/stdutil/private/stdarch.h 2005-08-07 22:54:26 UTC (rev 259)
@@ -1,174 +0,0 @@
-/* stdutil/private/stdarch.h. Generated by configure. */
-/* Copyright (c) 2000-2005, The Johns Hopkins University
- * All rights reserved.
- *
- * The contents of this file are subject to a license (the ``License'')
- * that is the exact equivalent of the BSD license as of July 23, 1999.
- * You may not use this file except in compliance with the License. The
- * specific language governing the rights and limitations of the License
- * can be found in the file ``STDUTIL_LICENSE'' found in this
- * distribution.
- *
- * Software distributed under the License is distributed on an AS IS
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *
- * The Original Software is:
- * The Stdutil Library
- *
- * Contributors:
- * Creator - John Lane Schultz (jschultz at cnds.jhu.edu)
- * The Center for Networking and Distributed Systems
- * (CNDS - http://www.cnds.jhu.edu)
- */
-
-#ifndef stdarch_h_2005_07_12_00_51_28_jschultz_at_cnds_jhu_edu
-#define stdarch_h_2005_07_12_00_51_28_jschultz_at_cnds_jhu_edu
-
-#include <stddef.h>
-#include <limits.h>
-
-/* the following #undef's are filled in by the configure script */
-
-#define SIZEOF_CHAR 1
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF_SIZE_T 4
-#define SIZEOF_VOID_P 4
-
-/* STDARCH_MAX_BYTE_ALIGNMENT must be a power of 2 (e.g. - 1, 2, 4, 8)
- and must be the most stringent byte alignment that your
- architecture requires for any basic type; 4 should be good enough
- for any 32 bit or smaller architectures, 8 should be good enough
- for any 64 bit or smaller architectures, etc.
-*/
-
-/* #undef STDARCH_MAX_BYTE_ALIGNMENT */
-#define STDARCH_MAX_BYTE_ALIGNMENT 4
-
-/* check if a NULL char * is all zero in memory */
-
-/* #undef STDARCH_NULL_IS_ZERO */
-#define STDARCH_NULL_IS_ZERO 1
-
-/* endian reorder mapping */
-
-#define STDENDIAN16_SWAP 1
-
-#define STDENDIAN32_NET0_FROM_HOST 3
-#define STDENDIAN32_NET1_FROM_HOST 2
-#define STDENDIAN32_NET2_FROM_HOST 1
-#define STDENDIAN32_NET3_FROM_HOST 0
-
-#define STDENDIAN32_HOST0_FROM_NET 3
-#define STDENDIAN32_HOST1_FROM_NET 2
-#define STDENDIAN32_HOST2_FROM_NET 1
-#define STDENDIAN32_HOST3_FROM_NET 0
-
-#define STDENDIAN64_NET0_FROM_HOST 7
-#define STDENDIAN64_NET1_FROM_HOST 6
-#define STDENDIAN64_NET2_FROM_HOST 5
-#define STDENDIAN64_NET3_FROM_HOST 4
-#define STDENDIAN64_NET4_FROM_HOST 3
-#define STDENDIAN64_NET5_FROM_HOST 2
-#define STDENDIAN64_NET6_FROM_HOST 1
-#define STDENDIAN64_NET7_FROM_HOST 0
-
-#define STDENDIAN64_HOST0_FROM_NET 7
-#define STDENDIAN64_HOST1_FROM_NET 6
-#define STDENDIAN64_HOST2_FROM_NET 5
-#define STDENDIAN64_HOST3_FROM_NET 4
-#define STDENDIAN64_HOST4_FROM_NET 3
-#define STDENDIAN64_HOST5_FROM_NET 2
-#define STDENDIAN64_HOST6_FROM_NET 1
-#define STDENDIAN64_HOST7_FROM_NET 0
-
-/* define std(u)int32, std(u)int64 and min/max constants */
-
-#if (SIZEOF_CHAR != 1)
-# error No 1 byte integer type found!
-#endif
-
-#if (SIZEOF_SHORT != 2)
-# error No 2 byte integer type found!
-#endif
-
-#if (SIZEOF_INT == 4)
-
-typedef int stdint32;
-typedef unsigned int stduint32;
-
-# define STDINT32_MAX INT_MAX
-# define STDINT32_MIN INT_MIN
-# define STDUINT32_MAX UINT_MAX
-
-#elif (SIZEOF_LONG == 4)
-
-typedef long stdint32;
-typedef unsigned long stduint32;
-
-#define STDINT32_MAX LONG_MAX
-#define STDINT32_MIN LONG_MIN
-#define STDUINT32_MAX ULONG_MAX
-
-#else
-# error No 4 byte integer type found!
-#endif
-
-#if defined(_WIN32)
-
-typedef __int64 stdint64;
-typedef unsigned __int64 stduint64;
-
-#elif (SIZEOF_LONG == 8)
-
-typedef long stdint64;
-typedef unsigned long stduint64;
-
-#elif (SIZEOF_LONG_LONG == 8)
-
-typedef long long stdint64;
-typedef unsigned long long stduint64;
-
-#else
-# error No 8 byte integeral type found!
-#endif
-
-#define STDINT64_MAX (~STDINT64_MIN)
-#define STDINT64_MIN ((stdint64) 0x1 << 63)
-#define STDUINT64_MAX ((stduint64) -1)
-
-/* define stdssize type and min/max constants */
-
-#if (SIZEOF_SIZE_T == 2)
-
-typedef short stdssize;
-
-# define STDSSIZE_MAX SHRT_MAX
-# define STDSSIZE_MIN SHRT_MIN
-
-#elif (SIZEOF_SIZE_T == 4)
-
-typedef stdint32 stdssize;
-
-# define STDSSIZE_MAX STDINT32_MAX
-# define STDSSIZE_MIN STDINT32_MIN
-
-#elif (SIZEOF_SIZE_T == 8)
-
-typedef stdint64 stdssize;
-
-# define STDSSIZE_MAX STDINT64_MAX
-# define STDSSIZE_MIN STDINT64_MIN
-
-#else
-# error No integral type of same size as size_t!
-#endif
-
-/* macros used for ensuring proper byte alignment of types in memory */
-
-#define STDARCH_PADDING(x) ((STDARCH_MAX_BYTE_ALIGNMENT - ((x) & (STDARCH_MAX_BYTE_ALIGNMENT - 1))) & (STDARCH_MAX_BYTE_ALIGNMENT - 1))
-#define STDARCH_PADDED_SIZE(x) ((x) + STDARCH_PADDING(x))
-
-#endif
More information about the Spread-cvs
mailing list