[Opende-svn] SF.net SVN: opende: [902] trunk

[<kw...@us...>]

Revision: 902
Author:   kwizatz
Date:     2006-04-03 13:43:38 -0700 (Mon, 03 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=902&view=rev

Log Message:
-----------
Modified Makefile.am in ode/src/ in order to prevent recompiling of sources for shared library.

Modified Paths:
--------------
    trunk/configure.in
    trunk/ode/src/Makefile.am
    trunk/ode/test/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-04-03 19:53:34 UTC (rev 901)
+++ trunk/configure.in	2006-04-03 20:43:38 UTC (rev 902)
@@ -271,6 +271,7 @@
 AC_CHECK_LIB(kernel32,main,[LIBS="$LIBS -lkernel32"])
 AC_CHECK_LIB(user32,main,[LIBS="$LIBS -luser32"])
 AC_CHECK_LIB(gdi32,main,[LIBS="$LIBS -lgdi32"])
+AC_CHECK_LIB(winmm,main,[LIBS="$LIBS -lwinmm"])
 
 dnl Add math and standard c++ lib just in case
 AC_CHECK_LIB(stdc++,main,[LIBS="$LIBS -lstdc++"])

Modified: trunk/ode/src/Makefile.am
===================================================================
--- trunk/ode/src/Makefile.am	2006-04-03 19:53:34 UTC (rev 901)
+++ trunk/ode/src/Makefile.am	2006-04-03 20:43:38 UTC (rev 902)
@@ -1,6 +1,6 @@
 AM_CXXFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CPPFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS = @ARCHFLAGS@ -I$(topsrcdir)/include -I$(top_builddir)/include
+AM_CFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include -I$(top_builddir)/include
 lib_LIBRARIES = libode.a
 libode_a_CPPFLAGS = -O2
 
@@ -12,10 +12,10 @@
 traplib_PROGRAMS=libode
 libode_DEPENDENCIES = libfast.a libode.a
 libode_LDFLAGS=-shared -fPIC
-libode_SOURCES=$(libode_a_SOURCES) $(libfast_a_SOURCES)
+libode_OBJECTS=$(libode_a_OBJECTS) $(libfast_a_OBJECTS)
 if OPCODE
 libode_DEPENDENCIES+= libOPCODE.a
-libode_SOURCES+=$(libOPCODE_a_SOURCES)
+libode_OBJECTS+=$(libOPCODE_a_OBJECTS)
 endif
 
 # convenience library to simulate per object cflags

Modified: trunk/ode/test/Makefile.am
===================================================================
--- trunk/ode/test/Makefile.am	2006-04-03 19:53:34 UTC (rev 901)
+++ trunk/ode/test/Makefile.am	2006-04-03 20:43:38 UTC (rev 902)
@@ -129,8 +129,10 @@
 					$(top_builddir)/drawstuff/src/libdrawstuff.a
 test_moving_trimesh_DEPENDENCIES=	$(top_builddir)/ode/src/libode.a \
 					$(top_builddir)/drawstuff/src/libdrawstuff.a
-test_basket_DEPENDENCIES=	        $(top_builddir)/ode/src/libode.a \
-				        $(top_builddir)/drawstuff/src/libdrawstuff.a
+
+test_basket_DEPENDENCIES=		$(top_builddir)/ode/src/libode.a \
+					$(top_builddir)/drawstuff/src/libdrawstuff.a
+
 endif
 
 test_ode_LDADD= -ldrawstuff -lode @GL_LIBS@ @LIBS@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.