From dc892f0f643564743de274a6495ec622fc7fe280 Mon Sep 17 00:00:00 2001 From: Jeff Cobb Date: Tue, 27 Apr 2004 21:18:40 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3302 --- aclocal.m4 | 2 +- client/Makefile.in | 28 +--------------------------- configure | 2 +- lib/Makefile.in | 28 ++++++---------------------- 4 files changed, 9 insertions(+), 51 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d07c7c043d..67ba8ba449 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1104,7 +1104,7 @@ AC_DEFUN([SAH_HEADER_STDCXX],[ # # Revision Log: # $Log$ -# Revision 1.82 2004/04/09 21:42:45 davea +# Revision 1.83 2004/04/27 21:18:33 jeffc # *** empty log message *** # # Revision 1.1 2003/12/11 18:38:24 korpela diff --git a/client/Makefile.in b/client/Makefile.in index ae580a431a..b5298050bd 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -219,7 +219,6 @@ boinc_client_SOURCES = \ ../lib/msg_log.C \ ../lib/parse.C \ ../lib/shmem.C \ - ../lib/synch.C \ ../lib/util.C @@ -286,7 +285,7 @@ am_boinc_client_OBJECTS = boinc_client-app.$(OBJEXT) \ boinc_client-language.$(OBJEXT) boinc_client-md5_file.$(OBJEXT) \ boinc_client-md5.$(OBJEXT) boinc_client-msg_log.$(OBJEXT) \ boinc_client-parse.$(OBJEXT) boinc_client-shmem.$(OBJEXT) \ - boinc_client-synch.$(OBJEXT) boinc_client-util.$(OBJEXT) + boinc_client-util.$(OBJEXT) boinc_client_OBJECTS = $(am_boinc_client_OBJECTS) boinc_client_LDFLAGS = am_cpu_benchmark_OBJECTS = cpu_benchmark.$(OBJEXT) @@ -338,7 +337,6 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-scheduler_op.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-shmem.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-ss_logic.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-synch.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-time_stats.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/boinc_client-util.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/cpu_benchmark.Po @@ -430,7 +428,6 @@ boinc_client-md5.$(OBJEXT): ../lib/md5.c boinc_client-msg_log.$(OBJEXT): ../lib/msg_log.C boinc_client-parse.$(OBJEXT): ../lib/parse.C boinc_client-shmem.$(OBJEXT): ../lib/shmem.C -boinc_client-synch.$(OBJEXT): ../lib/synch.C boinc_client-util.$(OBJEXT): ../lib/util.C boinc_client$(EXEEXT): $(boinc_client_OBJECTS) $(boinc_client_DEPENDENCIES) @rm -f boinc_client$(EXEEXT) @@ -485,7 +482,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-scheduler_op.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-shmem.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-ss_logic.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-synch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-time_stats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boinc_client-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_benchmark.Po@am__quote@ @@ -1395,28 +1391,6 @@ boinc_client-shmem.obj: ../lib/shmem.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-shmem.obj `if test -f '../lib/shmem.C'; then $(CYGPATH_W) '../lib/shmem.C'; else $(CYGPATH_W) '$(srcdir)/../lib/shmem.C'` -boinc_client-synch.o: ../lib/synch.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-synch.o -MD -MP -MF "$(DEPDIR)/boinc_client-synch.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-synch.o `test -f '../lib/synch.C' || echo '$(srcdir)/'`../lib/synch.C; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-synch.Tpo" "$(DEPDIR)/boinc_client-synch.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-synch.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../lib/synch.C' object='boinc_client-synch.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-synch.Po' tmpdepfile='$(DEPDIR)/boinc_client-synch.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-synch.o `test -f '../lib/synch.C' || echo '$(srcdir)/'`../lib/synch.C - -boinc_client-synch.obj: ../lib/synch.C -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-synch.obj -MD -MP -MF "$(DEPDIR)/boinc_client-synch.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o boinc_client-synch.obj `if test -f '../lib/synch.C'; then $(CYGPATH_W) '../lib/synch.C'; else $(CYGPATH_W) '$(srcdir)/../lib/synch.C'`; \ -@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/boinc_client-synch.Tpo" "$(DEPDIR)/boinc_client-synch.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/boinc_client-synch.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../lib/synch.C' object='boinc_client-synch.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/boinc_client-synch.Po' tmpdepfile='$(DEPDIR)/boinc_client-synch.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o boinc_client-synch.obj `if test -f '../lib/synch.C'; then $(CYGPATH_W) '../lib/synch.C'; else $(CYGPATH_W) '$(srcdir)/../lib/synch.C'` - boinc_client-util.o: ../lib/util.C @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(boinc_client_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT boinc_client-util.o -MD -MP -MF "$(DEPDIR)/boinc_client-util.Tpo" \ @am__fastdepCXX_TRUE@ -c -o boinc_client-util.o `test -f '../lib/util.C' || echo '$(srcdir)/'`../lib/util.C; \ diff --git a/configure b/configure index 1884012b7e..a659236ace 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.82 . +# From configure.ac Revision: 1.83 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for BOINC 3.01. # diff --git a/lib/Makefile.in b/lib/Makefile.in index 46d26de90a..986f193c80 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -171,7 +171,7 @@ AM_CPPFLAGS = \ LIBRSA = $(top_builddir)/RSAEuro/source/librsaeuro.a bin_PROGRAMS = crypt_prog -EXTRA_PROGRAMS = md5_test shmem_test msg_test synch_test +EXTRA_PROGRAMS = md5_test shmem_test msg_test noinst_LIBRARIES = libboinc.a #libboinc_graphics.a EXTRA_DIST = result_state.h parse.h std_fixes.h util.h @@ -200,7 +200,6 @@ libboinc_a_SOURCES = \ msg_queue.h \ parse.C \ shmem.C \ - synch.C \ util.C \ util.h \ xml_util.C \ @@ -214,7 +213,6 @@ libboinc_a_SOURCES = \ md5_test_SOURCES = md5_test.C md5.c md5_file.C shmem_test_SOURCES = shmem_test.C shmem.C msg_test_SOURCES = msg_test.C msg_queue.C -synch_test_SOURCES = synch_test.C synch.C crypt_prog_SOURCES = crypt_prog.C crypt.C md5.c md5_file.C crypt_prog_DEPENDENCIES = $(LIBRSA) crypt_prog_LDADD = $(RSA_LIBS) @@ -230,11 +228,9 @@ am_libboinc_a_OBJECTS = boinc_api.$(OBJEXT) mfile.$(OBJEXT) \ app_ipc.$(OBJEXT) base64.$(OBJEXT) diagnostics.$(OBJEXT) \ exception.$(OBJEXT) filesys.$(OBJEXT) language.$(OBJEXT) \ md5.$(OBJEXT) md5_file.$(OBJEXT) parse.$(OBJEXT) \ - shmem.$(OBJEXT) synch.$(OBJEXT) util.$(OBJEXT) \ - xml_util.$(OBJEXT) + shmem.$(OBJEXT) util.$(OBJEXT) xml_util.$(OBJEXT) libboinc_a_OBJECTS = $(am_libboinc_a_OBJECTS) -EXTRA_PROGRAMS = md5_test$(EXEEXT) shmem_test$(EXEEXT) msg_test$(EXEEXT) \ - synch_test$(EXEEXT) +EXTRA_PROGRAMS = md5_test$(EXEEXT) shmem_test$(EXEEXT) msg_test$(EXEEXT) bin_PROGRAMS = crypt_prog$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -258,11 +254,6 @@ shmem_test_OBJECTS = $(am_shmem_test_OBJECTS) shmem_test_LDADD = $(LDADD) shmem_test_DEPENDENCIES = shmem_test_LDFLAGS = -am_synch_test_OBJECTS = synch_test.$(OBJEXT) synch.$(OBJEXT) -synch_test_OBJECTS = $(am_synch_test_OBJECTS) -synch_test_LDADD = $(LDADD) -synch_test_DEPENDENCIES = -synch_test_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -276,8 +267,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/md5_test.Po ./$(DEPDIR)/mfile.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/msg_queue.Po ./$(DEPDIR)/msg_test.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/parse.Po ./$(DEPDIR)/shmem.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/shmem_test.Po ./$(DEPDIR)/synch.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/synch_test.Po ./$(DEPDIR)/util.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/shmem_test.Po ./$(DEPDIR)/util.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/xml_util.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -289,10 +279,9 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libboinc_a_SOURCES) $(crypt_prog_SOURCES) \ - $(md5_test_SOURCES) $(msg_test_SOURCES) $(shmem_test_SOURCES) \ - $(synch_test_SOURCES) + $(md5_test_SOURCES) $(msg_test_SOURCES) $(shmem_test_SOURCES) DIST_COMMON = $(top_srcdir)/Makefile.incl Makefile.am Makefile.in -SOURCES = $(libboinc_a_SOURCES) $(crypt_prog_SOURCES) $(md5_test_SOURCES) $(msg_test_SOURCES) $(shmem_test_SOURCES) $(synch_test_SOURCES) +SOURCES = $(libboinc_a_SOURCES) $(crypt_prog_SOURCES) $(md5_test_SOURCES) $(msg_test_SOURCES) $(shmem_test_SOURCES) all: all-am @@ -350,9 +339,6 @@ msg_test$(EXEEXT): $(msg_test_OBJECTS) $(msg_test_DEPENDENCIES) shmem_test$(EXEEXT): $(shmem_test_OBJECTS) $(shmem_test_DEPENDENCIES) @rm -f shmem_test$(EXEEXT) $(CXXLINK) $(shmem_test_LDFLAGS) $(shmem_test_OBJECTS) $(shmem_test_LDADD) $(LIBS) -synch_test$(EXEEXT): $(synch_test_OBJECTS) $(synch_test_DEPENDENCIES) - @rm -f synch_test$(EXEEXT) - $(CXXLINK) $(synch_test_LDFLAGS) $(synch_test_OBJECTS) $(synch_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -378,8 +364,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shmem.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shmem_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synch_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_util.Po@am__quote@