From 723e0459fa748646ada3bce507b6d3ee1e09824e Mon Sep 17 00:00:00 2001 From: maroy Date: Tue, 23 Nov 2004 11:51:22 +0000 Subject: [PATCH] added -pthread option to CFLAGS and LDFLAGS --- livesupport/modules/authentication/etc/Makefile.in | 8 ++++---- livesupport/modules/core/etc/Makefile.in | 6 +++--- livesupport/modules/core/etc/configure.ac | 6 +++--- .../modules/core/include/LiveSupport/Core/Thread.h | 8 ++------ livesupport/modules/db/etc/Makefile.in | 6 +++--- livesupport/modules/eventScheduler/etc/Makefile.in | 6 +++--- livesupport/modules/eventScheduler/etc/configure.ac | 6 +++--- livesupport/modules/playlistExecutor/etc/Makefile.in | 9 ++++++--- livesupport/modules/storage/etc/Makefile.in | 9 +++++---- livesupport/products/scheduler/etc/Makefile.in | 9 +++++---- livesupport/products/scheduler/etc/configure.ac | 6 +++--- 11 files changed, 40 insertions(+), 39 deletions(-) diff --git a/livesupport/modules/authentication/etc/Makefile.in b/livesupport/modules/authentication/etc/Makefile.in index 064befb6b..56eb41adc 100644 --- a/livesupport/modules/authentication/etc/Makefile.in +++ b/livesupport/modules/authentication/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.2 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.3 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/etc/Makefile.in,v $ # # @configure_input@ @@ -82,14 +82,14 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config # Configuration parameters #------------------------------------------------------------------------------- CPPFLAGS = @CPPFLAGS@ -CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ +CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 7da4d305c..5d712e1f5 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.13 $ +# Version : $Revision: 1.14 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/Makefile.in,v $ # # @configure_input@ @@ -88,14 +88,14 @@ export LD_LIBRARY_PATH=${USR_LIB_DIR} # Configuration parameters #------------------------------------------------------------------------------- CPPFLAGS = @CPPFLAGS@ -CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ +CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ ${ICU_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ -I${LIBXMLPP_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${LIB_DIR} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/core/etc/configure.ac b/livesupport/modules/core/etc/configure.ac index 70b9687cc..f0ea1b14d 100644 --- a/livesupport/modules/core/etc/configure.ac +++ b/livesupport/modules/core/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.5 $ +dnl Version : $Revision: 1.6 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,14 +35,14 @@ dnl----------------------------------------------------------------------------- AC_INIT(Core, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.5 $) +AC_REVISION($Revision: 1.6 $) AC_CONFIG_SRCDIR(../src/UniqueId.cxx) AC_CONFIG_HEADERS(configure.h) AC_PROG_CXX() -AC_CHECK_HEADERS(getopt.h sys/time.h pthread.h) +AC_CHECK_HEADERS(getopt.h sys/time.h) dnl----------------------------------------------------------------------------- diff --git a/livesupport/modules/core/include/LiveSupport/Core/Thread.h b/livesupport/modules/core/include/LiveSupport/Core/Thread.h index c9c17e2a3..15c94b872 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/Thread.h +++ b/livesupport/modules/core/include/LiveSupport/Core/Thread.h @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Thread.h,v $ ------------------------------------------------------------------------------*/ @@ -40,11 +40,7 @@ #include "configure.h" #endif -#ifdef HAVE_PTHREAD_H #include -#else -#error need pthread.h -#endif #include "LiveSupport/Core/Ptr.h" #include "LiveSupport/Core/RunnableInterface.h" @@ -66,7 +62,7 @@ namespace Core { * A generic thread executor class. * * @author $Author: maroy $ - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @see RunnableInterface */ class Thread diff --git a/livesupport/modules/db/etc/Makefile.in b/livesupport/modules/db/etc/Makefile.in index 5fe40609d..34f9fff26 100644 --- a/livesupport/modules/db/etc/Makefile.in +++ b/livesupport/modules/db/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/Makefile.in,v $ # # @configure_input@ @@ -80,14 +80,14 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config # Configuration parameters #------------------------------------------------------------------------------- CPPFLAGS = @CPPFLAGS@ -CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ +CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index 3851f8fa7..36d897ced 100644 --- a/livesupport/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/modules/eventScheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.2 $ +# Version : $Revision: 1.3 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -80,14 +80,14 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config # Configuration parameters #------------------------------------------------------------------------------- CPPFLAGS = @CPPFLAGS@ -CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ +CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -Wall -Wno-long-long \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ -I${LIBXMLPP_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} +LDFLAGS = @LDFLAGS@ -pthread -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${LIB_DIR} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/eventScheduler/etc/configure.ac b/livesupport/modules/eventScheduler/etc/configure.ac index d3b5d527b..504ab58b7 100644 --- a/livesupport/modules/eventScheduler/etc/configure.ac +++ b/livesupport/modules/eventScheduler/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.1 $ +dnl Version : $Revision: 1.2 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,14 +35,14 @@ dnl----------------------------------------------------------------------------- AC_INIT(EventScheduler, 1.0, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.1 $) +AC_REVISION($Revision: 1.2 $) AC_CONFIG_SRCDIR(../src/SchedulerThread.cxx) AC_CONFIG_HEADERS(configure.h) AC_PROG_CXX() -AC_CHECK_HEADERS(getopt.h unistd.h sys/time.h pthread.h) +AC_CHECK_HEADERS(getopt.h unistd.h sys/time.h) dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index 8aacf53a7..387664e43 100644 --- a/livesupport/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/modules/playlistExecutor/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.2 $ +# Version : $Revision: 1.3 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $ # # @configure_input@ @@ -90,7 +90,7 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config # Configuration parameters #------------------------------------------------------------------------------- CPPFLAGS = @CPPFLAGS@ -CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ +CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -Wall -Wno-long-long \ ${HELIX_CFLAGS} \ -I${USR_INCLUDE_DIR} \ @@ -99,7 +99,10 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ -I${HELIX_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${CORE_LIB_DIR} -L${HELIX_LIB_DIR} \ +LDFLAGS = @LDFLAGS@ -pthread \ + -L${USR_LIB_DIR} \ + -L${CORE_LIB_DIR} \ + -L${HELIX_LIB_DIR} \ -L${LIB_DIR} diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in index 7374872c3..ec7797602 100644 --- a/livesupport/modules/storage/etc/Makefile.in +++ b/livesupport/modules/storage/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.7 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/Makefile.in,v $ # # @configure_input@ @@ -86,7 +86,7 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config # Configuration parameters #------------------------------------------------------------------------------- CPPFLAGS = @CPPFLAGS@ -CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ +CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ @@ -94,7 +94,8 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ -I${CORE_INCLUDE_DIR} \ -I${AUTHENTICATION_INCLUDE_DIR} \ -I${INCLUDE_DIR} -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${CORE_LIB_DIR} \ +LDFLAGS = @LDFLAGS@ -pthread \ + -L${USR_LIB_DIR} -L${CORE_LIB_DIR} \ -L${AUTHENTICATION_LIB_DIR} -L${LIB_DIR} diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index f54ba0a46..b8df3a6cc 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.24 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.25 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -117,7 +117,7 @@ DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config # Configuration parameters #------------------------------------------------------------------------------- CPPFLAGS = @CPPFLAGS@ -CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ +CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ -pedantic -Wall -Wno-long-long \ -I${USR_INCLUDE_DIR} \ -I${BOOST_INCLUDE_DIR} \ @@ -129,7 +129,8 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ \ -I${PLAYLIST_EXECUTOR_INCLUDE_DIR} \ -I${EVENT_SCHEDULER_INCLUDE_DIR} \ -I${TMP_DIR} -LDFLAGS = @LDFLAGS@ -L${USR_LIB_DIR} -L${HELIX_LIB_DIR} \ +LDFLAGS = @LDFLAGS@ -pthread \ + -L${USR_LIB_DIR} -L${HELIX_LIB_DIR} \ -L${CORE_LIB_DIR} \ -L${AUTHENTICATION_LIB_DIR} \ -L${DB_LIB_DIR} \ diff --git a/livesupport/products/scheduler/etc/configure.ac b/livesupport/products/scheduler/etc/configure.ac index d4d8fc326..4ab159e17 100644 --- a/livesupport/products/scheduler/etc/configure.ac +++ b/livesupport/products/scheduler/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.4 $ +dnl Version : $Revision: 1.5 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,7 +35,7 @@ dnl----------------------------------------------------------------------------- AC_INIT(Scheduler, 0.1, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.4 $) +AC_REVISION($Revision: 1.5 $) AC_CONFIG_SRCDIR(../src/main.cxx) @@ -43,7 +43,7 @@ AC_CONFIG_HEADERS(configure.h) AC_PROG_CXX() AC_CHECK_HEADERS(sys/types.h unistd.h getopt.h signal.h sys/stat.h time.h) -AC_CHECK_HEADERS(stdio.h fcntl.h pthread.h sys/time.h) +AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h) dnl----------------------------------------------------------------------------- dnl enable compilaton for code coverage data