From: smolik Date: Tue, 21 Sep 2004 21:09:32 +0000 (+0000) Subject: RTNet and MinGW compilation correction X-Git-Tag: v0.3.2~40 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/c38921ea10e805242ef9864512a226e013d26640 RTNet and MinGW compilation correction --- diff --git a/admin/linux.m4 b/admin/linux.m4 index 1ebec8d..8d9cf4d 100644 --- a/admin/linux.m4 +++ b/admin/linux.m4 @@ -1,7 +1,7 @@ AC_DEFUN([DS_LINUX_DIR], [ - AC_ARG_WITH([linuxdir], + AC_ARG_WITH([linux], [AC_HELP_STRING([--with-linux=DIR], [path to Linux patched source directory])], [LINUX_DIR="${withval}"], @@ -214,13 +214,13 @@ AC_DEFUN([DS_LINUX_CONFIG_OPTION_MODULE], AC_DEFUN([DS_RTAI], [ - AC_ARG_WITH([rtaidir], + AC_ARG_WITH([rtai], [AC_HELP_STRING([--with-rtai=DIR], [path to configured RTAI 24.1.X sources, or RTAI 3 installation])], [RTAI_DIR="${withval}"], [RTAI_DIR=/usr/src/rtai]) - AC_ARG_WITH([rtnetdir], + AC_ARG_WITH([rtnet], [AC_HELP_STRING([--with-rtnet=DIR], [path to RTnet installation directory])], [RTNET_DIR="${withval}"], @@ -261,13 +261,13 @@ AC_DEFUN([DS_RTAI], AC_DEFUN([DS_RTLINUX], [ - AC_ARG_WITH([rtlinuxdir], + AC_ARG_WITH([rtlinux], [AC_HELP_STRING([--with-rtlinux=DIR], [path to RTLinux source directory])], [RTLINUX_DIR="${withval}"], [RTLINUX_DIR=/usr/src/rtlinux]) - AC_ARG_WITH([rtlinuxudpdir], + AC_ARG_WITH([rtlinuxudp], [AC_HELP_STRING([--with-rtlinuxudp=DIR], [path to RTLinux UDP source directory])], [RTLINUXUDP_DIR="${withval}"], diff --git a/configure b/configure index f903db4..067f4ae 100755 --- a/configure +++ b/configure @@ -2057,9 +2057,9 @@ fi -# Check whether --with-linuxdir or --without-linuxdir was given. -if test "${with_linuxdir+set}" = set; then - withval="$with_linuxdir" +# Check whether --with-linux or --without-linux was given. +if test "${with_linux+set}" = set; then + withval="$with_linux" LINUX_DIR="${withval}" else LINUX_DIR=default @@ -2251,18 +2251,18 @@ fi -# Check whether --with-rtaidir or --without-rtaidir was given. -if test "${with_rtaidir+set}" = set; then - withval="$with_rtaidir" +# Check whether --with-rtai or --without-rtai was given. +if test "${with_rtai+set}" = set; then + withval="$with_rtai" RTAI_DIR="${withval}" else RTAI_DIR=/usr/src/rtai fi; -# Check whether --with-rtnetdir or --without-rtnetdir was given. -if test "${with_rtnetdir+set}" = set; then - withval="$with_rtnetdir" +# Check whether --with-rtnet or --without-rtnet was given. +if test "${with_rtnet+set}" = set; then + withval="$with_rtnet" RTNET_DIR="${withval}" else RTNET_DIR=/usr/src/rtnet @@ -2376,18 +2376,18 @@ _ACEOF -# Check whether --with-rtlinuxdir or --without-rtlinuxdir was given. -if test "${with_rtlinuxdir+set}" = set; then - withval="$with_rtlinuxdir" +# Check whether --with-rtlinux or --without-rtlinux was given. +if test "${with_rtlinux+set}" = set; then + withval="$with_rtlinux" RTLINUX_DIR="${withval}" else RTLINUX_DIR=/usr/src/rtlinux fi; -# Check whether --with-rtlinuxudpdir or --without-rtlinuxudpdir was given. -if test "${with_rtlinuxudpdir+set}" = set; then - withval="$with_rtlinuxudpdir" +# Check whether --with-rtlinuxudp or --without-rtlinuxudp was given. +if test "${with_rtlinuxudp+set}" = set; then + withval="$with_rtlinuxudp" RTLINUXUDP_DIR="${withval}" else RTLINUXUDP_DIR="${RTLINUX_DIR}" @@ -9171,8 +9171,15 @@ _ACEOF LIBS="-lc_r $LIBS" else - { echo "$as_me:$LINENO: Can't compile on 100% without pthreads!!!" >&5 -echo "$as_me: Can't compile on 100% without pthreads!!!" >&6;} + if test ${MINGW} == 'yes' ; then + LIBS=$LIBS' $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a' + { echo "$as_me:$LINENO: Using internal version of pthreads!!!" >&5 +echo "$as_me: Using internal version of pthreads!!!" >&6;} + else + { { echo "$as_me:$LINENO: error: Can't compile without pthreads!!!" >&5 +echo "$as_me: error: Can't compile without pthreads!!!" >&2;} + { (exit 1); exit 1; }; } + fi fi diff --git a/configure.in b/configure.in index 501e4c8..fb87b03 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,10 @@ # Process this file with autoconf to produce a configure script. # -# $Id: configure.in,v 1.10 2004/08/30 19:18:21 smolik Exp $ +# $Id: configure.in,v 1.11 2004/09/21 21:09:33 smolik Exp $ # autoconf requirement -AC_PREREQ([2.57]) +AC_PREREQ([2.56]) AC_INIT([orte],[0.2.3],[petr.smolik@wo.cz]) AC_CONFIG_AUX_DIR(admin) @@ -129,7 +129,12 @@ if test -z ${CONFIG_ORTE_RT} ; then dnl Check for pthreads AC_CHECK_LIB(pthread, pthread_create, , AC_CHECK_LIB(c_r, pthread_create, , - AC_MSG_NOTICE([Can't compile on 100% without pthreads!!!]) + if test ${MINGW} == 'yes' ; then + LIBS=$LIBS' $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a' + AC_MSG_NOTICE([Using internal version of pthreads!!!]) + else + AC_MSG_ERROR([Can't compile without pthreads!!!]) + fi ) ) fi diff --git a/orte/examples/hello/Makefile.am b/orte/examples/hello/Makefile.am index 059fb08..617516f 100644 --- a/orte/examples/hello/Makefile.am +++ b/orte/examples/hello/Makefile.am @@ -6,13 +6,10 @@ if CONFIG_ORTE_RT HelloWorldPublisher_rt_ko_LINK = $(top_builddir)/modtool --link -o $@ else noinst_PROGRAMS = HelloWorldPublisher HelloWorldSubscriber -if CONFIG_ORTE_MINGW - win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -endif HelloWorldPublisher_SOURCES = HelloWorldPublisher.c - HelloWorldPublisher_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) + HelloWorldPublisher_LDADD = $(top_builddir)/orte/liborte/liborte.la HelloWorldPublisher_LDFLAGS = -static HelloWorldSubscriber_SOURCES = HelloWorldSubscriber.c - HelloWorldSubscriber_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) + HelloWorldSubscriber_LDADD = $(top_builddir)/orte/liborte/liborte.la HelloWorldSubscriber_LDFLAGS = -static endif \ No newline at end of file diff --git a/orte/examples/hello/Makefile.in b/orte/examples/hello/Makefile.in index 4e3f2b5..4df6df2 100644 --- a/orte/examples/hello/Makefile.in +++ b/orte/examples/hello/Makefile.in @@ -58,10 +58,8 @@ am__HelloWorldPublisher_SOURCES_DIST = HelloWorldPublisher.c @CONFIG_ORTE_RT_FALSE@am_HelloWorldPublisher_OBJECTS = \ @CONFIG_ORTE_RT_FALSE@ HelloWorldPublisher.$(OBJEXT) HelloWorldPublisher_OBJECTS = $(am_HelloWorldPublisher_OBJECTS) -@CONFIG_ORTE_MINGW_TRUE@@CONFIG_ORTE_RT_FALSE@am__DEPENDENCIES_1 = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a @CONFIG_ORTE_RT_FALSE@HelloWorldPublisher_DEPENDENCIES = \ -@CONFIG_ORTE_RT_FALSE@ $(top_builddir)/orte/liborte/liborte.la \ -@CONFIG_ORTE_RT_FALSE@ $(am__DEPENDENCIES_1) +@CONFIG_ORTE_RT_FALSE@ $(top_builddir)/orte/liborte/liborte.la am__HelloWorldPublisher_rt_ko_SOURCES_DIST = HelloWorldPublisher.c @CONFIG_ORTE_RT_TRUE@am_HelloWorldPublisher_rt_ko_OBJECTS = \ @CONFIG_ORTE_RT_TRUE@ HelloWorldPublisher.$(OBJEXT) @@ -73,8 +71,7 @@ am__HelloWorldSubscriber_SOURCES_DIST = HelloWorldSubscriber.c @CONFIG_ORTE_RT_FALSE@ HelloWorldSubscriber.$(OBJEXT) HelloWorldSubscriber_OBJECTS = $(am_HelloWorldSubscriber_OBJECTS) @CONFIG_ORTE_RT_FALSE@HelloWorldSubscriber_DEPENDENCIES = \ -@CONFIG_ORTE_RT_FALSE@ $(top_builddir)/orte/liborte/liborte.la \ -@CONFIG_ORTE_RT_FALSE@ $(am__DEPENDENCIES_1) +@CONFIG_ORTE_RT_FALSE@ $(top_builddir)/orte/liborte/liborte.la am__HelloWorldSubscriber_rt_ko_SOURCES_DIST = HelloWorldSubscriber.c @CONFIG_ORTE_RT_TRUE@am_HelloWorldSubscriber_rt_ko_OBJECTS = \ @CONFIG_ORTE_RT_TRUE@ HelloWorldSubscriber.$(OBJEXT) @@ -250,12 +247,11 @@ target_vendor = @target_vendor@ @CONFIG_ORTE_RT_TRUE@HelloWorldSubscriber_rt_ko_LINK = $(top_builddir)/modtool --link -o $@ @CONFIG_ORTE_RT_TRUE@HelloWorldPublisher_rt_ko_SOURCES = HelloWorldPublisher.c @CONFIG_ORTE_RT_TRUE@HelloWorldPublisher_rt_ko_LINK = $(top_builddir)/modtool --link -o $@ -@CONFIG_ORTE_MINGW_TRUE@@CONFIG_ORTE_RT_FALSE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a @CONFIG_ORTE_RT_FALSE@HelloWorldPublisher_SOURCES = HelloWorldPublisher.c -@CONFIG_ORTE_RT_FALSE@HelloWorldPublisher_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +@CONFIG_ORTE_RT_FALSE@HelloWorldPublisher_LDADD = $(top_builddir)/orte/liborte/liborte.la @CONFIG_ORTE_RT_FALSE@HelloWorldPublisher_LDFLAGS = -static @CONFIG_ORTE_RT_FALSE@HelloWorldSubscriber_SOURCES = HelloWorldSubscriber.c -@CONFIG_ORTE_RT_FALSE@HelloWorldSubscriber_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +@CONFIG_ORTE_RT_FALSE@HelloWorldSubscriber_LDADD = $(top_builddir)/orte/liborte/liborte.la @CONFIG_ORTE_RT_FALSE@HelloWorldSubscriber_LDFLAGS = -static all: all-am diff --git a/orte/examples/ping/Makefile.am b/orte/examples/ping/Makefile.am index b49afed..99fef40 100644 --- a/orte/examples/ping/Makefile.am +++ b/orte/examples/ping/Makefile.am @@ -1,9 +1,6 @@ bin_PROGRAMS = orteping orteping_SOURCES = orteping.c -if CONFIG_ORTE_MINGW - win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -endif -orteping_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +orteping_LDADD = $(top_builddir)/orte/liborte/liborte.la orteping_LDFLAGS = -static diff --git a/orte/examples/ping/Makefile.in b/orte/examples/ping/Makefile.in index e71bcbf..404d4fb 100644 --- a/orte/examples/ping/Makefile.in +++ b/orte/examples/ping/Makefile.in @@ -53,9 +53,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_orteping_OBJECTS = orteping.$(OBJEXT) orteping_OBJECTS = $(am_orteping_OBJECTS) -@CONFIG_ORTE_MINGW_TRUE@am__DEPENDENCIES_1 = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -orteping_DEPENDENCIES = $(top_builddir)/orte/liborte/liborte.la \ - $(am__DEPENDENCIES_1) +orteping_DEPENDENCIES = $(top_builddir)/orte/liborte/liborte.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/orte/include depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -215,8 +213,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ orteping_SOURCES = orteping.c -@CONFIG_ORTE_MINGW_TRUE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -orteping_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +orteping_LDADD = $(top_builddir)/orte/liborte/liborte.la orteping_LDFLAGS = -static all: all-am diff --git a/orte/examples/reliable/Makefile.am b/orte/examples/reliable/Makefile.am index d529b87..0a09880 100644 --- a/orte/examples/reliable/Makefile.am +++ b/orte/examples/reliable/Makefile.am @@ -1,17 +1,13 @@ noinst_PROGRAMS = publisher subscriberreliable subscriberbesteffort -if CONFIG_ORTE_MINGW - win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -endif - publisher_SOURCES = publisher.c -publisher_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +publisher_LDADD = $(top_builddir)/orte/liborte/liborte.la publisher_LDFLAGS = -static subscriberreliable_SOURCES = subscriberreliable.c -subscriberreliable_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +subscriberreliable_LDADD = $(top_builddir)/orte/liborte/liborte.la subscriberreliable_LDFLAGS = -static subscriberbesteffort_SOURCES = subscriberbesteffort.c -subscriberbesteffort_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +subscriberbesteffort_LDADD = $(top_builddir)/orte/liborte/liborte.la subscriberbesteffort_LDFLAGS = -static diff --git a/orte/examples/reliable/Makefile.in b/orte/examples/reliable/Makefile.in index 212b9cf..cbba95b 100644 --- a/orte/examples/reliable/Makefile.in +++ b/orte/examples/reliable/Makefile.in @@ -52,17 +52,15 @@ CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) am_publisher_OBJECTS = publisher.$(OBJEXT) publisher_OBJECTS = $(am_publisher_OBJECTS) -@CONFIG_ORTE_MINGW_TRUE@am__DEPENDENCIES_1 = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -publisher_DEPENDENCIES = $(top_builddir)/orte/liborte/liborte.la \ - $(am__DEPENDENCIES_1) +publisher_DEPENDENCIES = $(top_builddir)/orte/liborte/liborte.la am_subscriberbesteffort_OBJECTS = subscriberbesteffort.$(OBJEXT) subscriberbesteffort_OBJECTS = $(am_subscriberbesteffort_OBJECTS) subscriberbesteffort_DEPENDENCIES = \ - $(top_builddir)/orte/liborte/liborte.la $(am__DEPENDENCIES_1) + $(top_builddir)/orte/liborte/liborte.la am_subscriberreliable_OBJECTS = subscriberreliable.$(OBJEXT) subscriberreliable_OBJECTS = $(am_subscriberreliable_OBJECTS) subscriberreliable_DEPENDENCIES = \ - $(top_builddir)/orte/liborte/liborte.la $(am__DEPENDENCIES_1) + $(top_builddir)/orte/liborte/liborte.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/orte/include depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -225,15 +223,14 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -@CONFIG_ORTE_MINGW_TRUE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a publisher_SOURCES = publisher.c -publisher_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +publisher_LDADD = $(top_builddir)/orte/liborte/liborte.la publisher_LDFLAGS = -static subscriberreliable_SOURCES = subscriberreliable.c -subscriberreliable_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +subscriberreliable_LDADD = $(top_builddir)/orte/liborte/liborte.la subscriberreliable_LDFLAGS = -static subscriberbesteffort_SOURCES = subscriberbesteffort.c -subscriberbesteffort_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +subscriberbesteffort_LDADD = $(top_builddir)/orte/liborte/liborte.la subscriberbesteffort_LDFLAGS = -static all: all-am diff --git a/orte/examples/spy/Makefile.am b/orte/examples/spy/Makefile.am index 4ee40e5..f94d1c6 100644 --- a/orte/examples/spy/Makefile.am +++ b/orte/examples/spy/Makefile.am @@ -1,10 +1,7 @@ bin_PROGRAMS = ortespy ortespy_SOURCES = ortespy.c -if CONFIG_ORTE_MINGW - win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -endif -ortespy_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +ortespy_LDADD = $(top_builddir)/orte/liborte/liborte.la ortespy_LDFLAGS = -static diff --git a/orte/examples/spy/Makefile.in b/orte/examples/spy/Makefile.in index 1b53e5e..95f72c2 100644 --- a/orte/examples/spy/Makefile.in +++ b/orte/examples/spy/Makefile.in @@ -53,9 +53,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_ortespy_OBJECTS = ortespy.$(OBJEXT) ortespy_OBJECTS = $(am_ortespy_OBJECTS) -@CONFIG_ORTE_MINGW_TRUE@am__DEPENDENCIES_1 = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -ortespy_DEPENDENCIES = $(top_builddir)/orte/liborte/liborte.la \ - $(am__DEPENDENCIES_1) +ortespy_DEPENDENCIES = $(top_builddir)/orte/liborte/liborte.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/orte/include depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -215,8 +213,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ ortespy_SOURCES = ortespy.c -@CONFIG_ORTE_MINGW_TRUE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -ortespy_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +ortespy_LDADD = $(top_builddir)/orte/liborte/liborte.la ortespy_LDFLAGS = -static all: all-am diff --git a/orte/include/orte_config_omk_rtl.h b/orte/include/orte_config_omk_rtl.h index f75df7b..e1d427a 100644 --- a/orte/include/orte_config_omk_rtl.h +++ b/orte/include/orte_config_omk_rtl.h @@ -79,6 +79,8 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_NET_IF_H */ +#define HAVE_ERRNO_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_NICTAB_H 1 diff --git a/orte/include/orte_headers.h b/orte/include/orte_headers.h index 3f89704..caecbed 100644 --- a/orte/include/orte_headers.h +++ b/orte/include/orte_headers.h @@ -173,11 +173,13 @@ extern "C" { #define SOCK_BSD #elif CONFIG_ORTE_MINGW #define SOCK_WIN - #include - #include + #ifndef HAVE_PTHREAD_H + #include + #endif #ifndef __GETOPT_H__ //mingw #include #endif + #include #include #define ioctl ioctlsocket #elif defined CONFIG_ORTE_RTL diff --git a/orte/liborte/Makefile.am b/orte/liborte/Makefile.am index ad6b2af..34214d8 100644 --- a/orte/liborte/Makefile.am +++ b/orte/liborte/Makefile.am @@ -75,8 +75,8 @@ liborte_la_SOURCES = $(LIBORTE_FILES) liborte_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ - -export-dynamic \ - $(LDADDS) + -export-dynamic +# $(LDADDS) liborte_la_CFLAGS = $(AM_CFLAGS) endif diff --git a/orte/liborte/Makefile.in b/orte/liborte/Makefile.in index 8a1c909..7bb4d4a 100644 --- a/orte/liborte/Makefile.in +++ b/orte/liborte/Makefile.in @@ -450,9 +450,9 @@ LIBORTE_HDRS2 = \ @CONFIG_ORTE_RT_FALSE@liborte_la_LDFLAGS = \ @CONFIG_ORTE_RT_FALSE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ @CONFIG_ORTE_RT_FALSE@ -release $(LT_RELEASE) \ -@CONFIG_ORTE_RT_FALSE@ -export-dynamic \ -@CONFIG_ORTE_RT_FALSE@ $(LDADDS) +@CONFIG_ORTE_RT_FALSE@ -export-dynamic +# $(LDADDS) @CONFIG_ORTE_RT_FALSE@liborte_la_CFLAGS = $(AM_CFLAGS) # headers diff --git a/orte/liborte/RTPSCSTWriter.c b/orte/liborte/RTPSCSTWriter.c index 43b32de..eaa1d97 100644 --- a/orte/liborte/RTPSCSTWriter.c +++ b/orte/liborte/RTPSCSTWriter.c @@ -409,7 +409,7 @@ CSTWriterDestroyCSChangeForReader(CSTRemoteReader *cstRemoteReader, } pthread_mutex_lock(&cstRemoteReader->cstWriter->mutexCSChangeDestroyed); cstRemoteReader->cstWriter->condValueCSChangeDestroyed=1; - pthread_cond_broadcast(&cstRemoteReader->cstWriter->condCSChangeDestroyed); + pthread_cond_signal(&cstRemoteReader->cstWriter->condCSChangeDestroyed); pthread_mutex_unlock(&cstRemoteReader->cstWriter->mutexCSChangeDestroyed); debug(51,5) ("Publication: new queue level (%d)\n", cstRemoteReader->cstWriter->csChangesCounter); diff --git a/orte/manager/Makefile.am b/orte/manager/Makefile.am index 808cbf0..958f920 100644 --- a/orte/manager/Makefile.am +++ b/orte/manager/Makefile.am @@ -9,9 +9,6 @@ ortemanager_SOURCES = ortemanager.c if CONFIG_ORTE_WIN ortemanager_SOURCES += service.c endif -if CONFIG_ORTE_MINGW - win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -endif -ortemanager_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +ortemanager_LDADD = $(top_builddir)/orte/liborte/liborte.la ortemanager_LDFLAGS = -static endif diff --git a/orte/manager/Makefile.in b/orte/manager/Makefile.in index c55e798..9cccf60 100644 --- a/orte/manager/Makefile.in +++ b/orte/manager/Makefile.in @@ -59,10 +59,8 @@ am__ortemanager_SOURCES_DIST = ortemanager.c service.c @CONFIG_ORTE_RT_FALSE@am_ortemanager_OBJECTS = ortemanager.$(OBJEXT) \ @CONFIG_ORTE_RT_FALSE@ $(am__objects_1) ortemanager_OBJECTS = $(am_ortemanager_OBJECTS) -@CONFIG_ORTE_MINGW_TRUE@@CONFIG_ORTE_RT_FALSE@am__DEPENDENCIES_1 = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a @CONFIG_ORTE_RT_FALSE@ortemanager_DEPENDENCIES = \ -@CONFIG_ORTE_RT_FALSE@ $(top_builddir)/orte/liborte/liborte.la \ -@CONFIG_ORTE_RT_FALSE@ $(am__DEPENDENCIES_1) +@CONFIG_ORTE_RT_FALSE@ $(top_builddir)/orte/liborte/liborte.la am__ortemanager_rt_ko_SOURCES_DIST = ortemanager.c @CONFIG_ORTE_RT_TRUE@am_ortemanager_rt_ko_OBJECTS = \ @CONFIG_ORTE_RT_TRUE@ ortemanager_rt_ko-ortemanager.$(OBJEXT) @@ -233,8 +231,7 @@ target_vendor = @target_vendor@ @CONFIG_ORTE_RT_TRUE@ortemanager_rt_ko_SOURCES = ortemanager.c @CONFIG_ORTE_RT_TRUE@ortemanager_rt_ko_LINK = $(top_builddir)/modtool --link -o $@ @CONFIG_ORTE_RT_FALSE@ortemanager_SOURCES = ortemanager.c $(am__append_1) -@CONFIG_ORTE_MINGW_TRUE@@CONFIG_ORTE_RT_FALSE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a -@CONFIG_ORTE_RT_FALSE@ortemanager_LDADD = $(top_builddir)/orte/liborte/liborte.la $(win_libs) +@CONFIG_ORTE_RT_FALSE@ortemanager_LDADD = $(top_builddir)/orte/liborte/liborte.la @CONFIG_ORTE_RT_FALSE@ortemanager_LDFLAGS = -static all: all-am diff --git a/readme b/readme index 5b3c073..f38c2e7 100644 --- a/readme +++ b/readme @@ -45,7 +45,7 @@ make install How to start? ------------- run :ortemanager & -see :ortemanager -h for usaged +see :ortemanager -h for usage note:ortemanager have to be running during all communication. For future work can be added into /etc/init.d/... script for starting ortemanager during boot of machine. This script (redhat and mandrake) is placed in