You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/01/24 15:42:45 UTC
svn commit: r499422 - in /incubator/tuscany/cpp/sca:
runtime/extensions/python/src/Makefile.am
runtime/extensions/ruby/src/Makefile.am samples/configure.ac
Author: robbinspg
Date: Wed Jan 24 06:42:44 2007
New Revision: 499422
URL: http://svn.apache.org/viewvc?view=rev&rev=499422
Log:
Mac OS X changes to makefiles
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am
incubator/tuscany/cpp/sca/samples/configure.ac
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am?view=diff&rev=499422&r1=499421&r2=499422
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am Wed Jan 24 06:42:44 2007
@@ -19,8 +19,7 @@
lib_LTLIBRARIES = libtuscany_sca_python.la
install-exec-hook:
- cd $(libdir); ln -s -f libtuscany_sca_python.so sca.so
-
+ cd $(libdir); ln -s -f libtuscany_sca_python$(libsuffix) sca.so
pydir=$(prefix)/extensions/python/lib
py_DATA = tuscany/sca/python/sca_proxy.py
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am?view=diff&rev=499422&r1=499421&r2=499422
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am Wed Jan 24 06:42:44 2007
@@ -19,8 +19,7 @@
lib_LTLIBRARIES = libtuscany_sca_ruby.la
install-exec-hook:
- cd $(libdir); ln -s -f libtuscany_sca_ruby.so tuscany_sca_ruby.so
-
+ cd $(libdir); ln -s -f libtuscany_sca_ruby$(libsuffix) tuscany_sca_ruby$(libsuffix)
rootdir=$(prefix)/extensions/ruby
Modified: incubator/tuscany/cpp/sca/samples/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/configure.ac?view=diff&rev=499422&r1=499421&r2=499422
==============================================================================
--- incubator/tuscany/cpp/sca/samples/configure.ac (original)
+++ incubator/tuscany/cpp/sca/samples/configure.ac Wed Jan 24 06:42:44 2007
@@ -39,16 +39,14 @@
if test "x$UNAME" = "xDarwin"; then
AC_DEFINE([IS_DARWIN], [1], [Set to 1 when running on Darwin - Mac OSX])
AC_MSG_RESULT(yes)
+ AC_SUBST([libsuffix],[".dylib"])
+ is_darwin=true
else
AC_MSG_RESULT(no)
+ AC_SUBST([libsuffix],[".so"])
+ is_darwin=false
fi
-
-# Check for dynamic library suffixes
-AC_MSG_CHECKING([checking for dynamic library suffix])
-AC_CHECK_HEADER([sys/appleapiopts.h],
- [AC_SUBST([libsuffix],[".dylib"]) AC_MSG_RESULT([using .dylib])],
- [AC_SUBST([libsuffix],[".so"]) AC_MSG_RESULT([using .so])]
-)
+AM_CONDITIONAL([DARWIN], [test x$is_darmin = xtrue])
# Checks for libraries.
@@ -191,7 +189,6 @@
CppCalculator/Makefile
CppCalculator/sample.calculator/Makefile
CppCalculator/sample.calculator.client/Makefile
- CppCalculator/sample.calculator.wsclient/Makefile
RubyCalculator/Makefile
RubyCalculator/sample.calculator/Makefile
RubyCalculator/sample.calculator.client/Makefile
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org