Menu
▾
▴
[Opende-svn] SF.net SVN: opende: [991] trunk
|
From: <kw...@us...> - 2006-06-12 18:13:47
|
Revision: 991 Author: kwizatz Date: 2006-06-12 11:13:29 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/opende/?rev=991&view=rev Log Message: ----------- Moved around soname instalation steps, fixed copy-paste related typo Modified Paths: -------------- trunk/Makefile.am trunk/configure.in trunk/ode/test/Makefile.am Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-06-12 02:40:48 UTC (rev 990) +++ trunk/Makefile.am 2006-06-12 18:13:29 UTC (rev 991) @@ -20,9 +20,11 @@ if USE_SONAME install-exec-hook: - /sbin/ldconfig ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ $(prefix)/lib/libode.so ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ + $(prefix)/lib/@ODE_SONAME@ + ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@ + /sbin/ldconfig endif Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-06-12 02:40:48 UTC (rev 990) +++ trunk/configure.in 2006-06-12 18:13:29 UTC (rev 991) @@ -38,7 +38,7 @@ dnl Check if using sonames is requested dnl THIS IS TEMPORARY! AC_MSG_CHECKING(if a soname should be set) -AC_ARG_ENABLE(soname,AC_HELP_STRING([--enable-opcode], +AC_ARG_ENABLE(soname,AC_HELP_STRING([--enable-soname], [Configure ODE shared library to set the soname field on ELF files]), use_soname=$enableval,use_soname=no) AC_MSG_RESULT($use_soname) Modified: trunk/ode/test/Makefile.am =================================================================== --- trunk/ode/test/Makefile.am 2006-06-12 02:40:48 UTC (rev 990) +++ trunk/ode/test/Makefile.am 2006-06-12 18:13:29 UTC (rev 991) @@ -136,28 +136,28 @@ endif -test_ode_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_chain2_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_chain1_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_joints_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_motor_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_buggy_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_cyl_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_cylvssphere_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_step_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_hinge_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_boxstack_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_space_stress_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_friction_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_I_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_space_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_crash_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_slider_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_collision_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ +test_ode_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_chain2_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_chain1_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_joints_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_motor_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_buggy_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_cyl_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_cylvssphere_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_step_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_hinge_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_boxstack_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_space_stress_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_friction_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_I_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_space_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_crash_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_slider_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_collision_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ if OPCODE -test_trimesh_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_moving_trimesh_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ -test_basket_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@ +test_trimesh_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_moving_trimesh_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ +test_basket_LDADD= -ldrawstuff $(top_builddir)/ode/src/libode.a @GL_LIBS@ @LIBS@ endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
