Menu
▾
▴
[Opende-svn] SF.net SVN: opende: [926] trunk
|
From: <kw...@us...> - 2006-04-14 17:23:58
|
Revision: 926 Author: kwizatz Date: 2006-04-14 10:23:44 -0700 (Fri, 14 Apr 2006) ViewCVS: http://svn.sourceforge.net/opende/?rev=926&view=rev Log Message: ----------- Fix for compiling shared libraries on MacOSX Modified Paths: -------------- trunk/Makefile trunk/configure.in trunk/ode/src/Makefile.am Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2006-04-14 15:10:38 UTC (rev 925) +++ trunk/Makefile 2006-04-14 17:23:44 UTC (rev 926) @@ -1,370 +1,641 @@ -######################################################################### -# # -# Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith. # -# All rights reserved. Email: ru...@q1... Web: www.q12.org # -# # -# This library is free software; you can redistribute it and/or # -# modify it under the terms of EITHER: # -# (1) The GNU Lesser General Public License as published by the Free # -# Software Foundation; either version 2.1 of the License, or (at # -# your option) any later version. The text of the GNU Lesser # -# General Public License is included with this library in the # -# file LICENSE.TXT. # -# (2) The BSD-style license that is included with this library in # -# the file LICENSE-BSD.TXT. # -# # -# This library is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files # -# LICENSE.TXT and LICENSE-BSD.TXT for more details. # -# # -######################################################################### +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile. Generated from Makefile.in by configure. -.SUFFIXES: +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -USER_SETTINGS=config/user-settings -include $(USER_SETTINGS) -PLATFORM_MAKEFILE=config/makefile.$(PLATFORM) -include $(PLATFORM_MAKEFILE) +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -############################################################################## -# check some variables that were supposed to be defined -ifneq ($(BUILD),debug) -ifneq ($(BUILD),release) -$(error the BUILD variable is not set properly) -endif -endif -ifneq ($(PRECISION),SINGLE) -ifneq ($(PRECISION),DOUBLE) -$(error the PRECISION variable is not set properly) -endif -endif +srcdir = . +top_srcdir = . -############################################################################## -# package settings +pkgdatadir = $(datadir)/ODE +pkglibdir = $(libdir)/ODE +pkgincludedir = $(includedir)/ODE +top_builddir = . +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = i686-pc-linux-gnu +host_triplet = i686-pc-linux-gnu +target_triplet = i686-pc-linux-gnu +DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/ode-config.in \ + $(top_srcdir)/configure INSTALL compile config.guess \ + config.sub depcomp install-sh missing +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/include/ode/config.h +CONFIG_CLEAN_FILES = ode-config +am__installdirs = "$(DESTDIR)$(bindir)" +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = ${SHELL} /home/kwizatz/opende/missing --run aclocal-1.9 +ALLOCA = +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/kwizatz/opende/missing --run tar +ARCHFLAGS = +AUTOCONF = ${SHELL} /home/kwizatz/opende/missing --run autoconf +AUTOHEADER = ${SHELL} /home/kwizatz/opende/missing --run autoheader +AUTOMAKE = ${SHELL} /home/kwizatz/opende/missing --run automake-1.9 +AWK = gawk +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g +CPP = gcc -E +CPPFLAGS = -g +CXX = g++ +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +DRAWSTUFF = +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EXEEXT = +GL_LIBS = -lGL -lGLU -lXmu -lXi +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = -lstdc++ -lm -lpthread +LTLIBOBJS = +MAKEINFO = ${SHELL} /home/kwizatz/opende/missing --run makeinfo +OBJEXT = o +ODE_AGE = 0 +ODE_CURRENT = 0 +ODE_RELEASE = 0.5.0 +ODE_REVISION = 5 +OPCODE_FALSE = # +OPCODE_TRUE = +PACKAGE = ODE +PACKAGE_BUGREPORT = od...@q1... +PACKAGE_NAME = ODE +PACKAGE_STRING = ODE 0.6.0-rc1 +PACKAGE_TARNAME = ode +PACKAGE_VERSION = 0.6.0-rc1 +PATH_SEPARATOR = : +RANLIB = ranlib +SET_MAKE = +SHARED_LDFLAGS = -shared +SHELL = /bin/sh +STRIP = +TOPDIR = /home/kwizatz/opende +VERSION = 0.6.0-rc1 +WIN32_FALSE = +WIN32_TRUE = # +WINDRES = +X11_FALSE = # +X11_TRUE = +X86_64_SYSTEM_FALSE = +X86_64_SYSTEM_TRUE = # +X_CFLAGS = +X_EXTRA_LIBS = +X_LIBS = +X_PRE_LIBS = -lSM -lICE +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_RANLIB = ranlib +ac_ct_STRIP = +ac_ct_WINDRES = +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build = i686-pc-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = pc +datadir = ${prefix}/share +exec_prefix = ${prefix} +host = i686-pc-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = pc +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /home/kwizatz/opende/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- +oldincludedir = /usr/include +prefix = /usr/local +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +so_ext = .so +sysconfdir = ${prefix}/etc +target = i686-pc-linux-gnu +target_alias = +target_cpu = i686 +target_os = linux-gnu +target_vendor = pc +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +SUBDIRS = include drawstuff ode +bin_SCRIPTS = ode-config +all: all-recursive -ODE_SRC = \ - ode/src/array.cpp \ - ode/src/error.cpp \ - ode/src/memory.cpp \ - ode/src/obstack.cpp \ - ode/src/odemath.cpp \ - ode/src/matrix.cpp \ - ode/src/misc.cpp \ - ode/src/rotation.cpp \ - ode/src/mass.cpp \ - ode/src/ode.cpp \ - ode/src/step.cpp \ - ode/src/stepfast.cpp \ - ode/src/quickstep.cpp \ - ode/src/util.cpp \ - ode/src/lcp.cpp \ - ode/src/joint.cpp \ - ode/src/timer.cpp \ - ode/src/mat.cpp \ - ode/src/testing.cpp \ - ode/src/export-dif.cpp \ - ode/src/collision_kernel.cpp \ - ode/src/collision_util.cpp \ - ode/src/collision_std.cpp \ - ode/src/collision_space.cpp \ - ode/src/collision_transform.cpp \ - ode/src/collision_quadtreespace.cpp +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -ifdef OPCODE_DIRECTORY -ODE_SRC +=ode/src/collision_trimesh.cpp \ - ode/src/collision_trimesh_sphere.cpp \ - ode/src/collision_trimesh_box.cpp \ - ode/src/collision_trimesh_trimesh.cpp \ - ode/src/collision_trimesh_ray.cpp \ - ode/src/collision_trimesh_ccylinder.cpp \ - ode/src/collision_trimesh_distance.cpp -endif +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck -ODE_PREGEN_SRC = \ - ode/src/fastldlt.c \ - ode/src/fastlsolve.c \ - ode/src/fastltsolve.c \ - ode/src/fastdot.c +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +ode-config: $(top_builddir)/config.status $(srcdir)/ode-config.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done -ifeq ($(WINDOWS),1) -DRAWSTUFF_SRC = drawstuff/src/drawstuff.cpp drawstuff/src/windows.cpp -RESOURCE_FILE=lib/resources.RES -else -DRAWSTUFF_SRC = drawstuff/src/drawstuff.cpp drawstuff/src/x11.cpp -endif +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done +uninstall-info-am: -ODE_LIB_NAME=ode -DRAWSTUFF_LIB_NAME=drawstuff +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" -INCPATH=include -LIBPATH=lib +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done -ODE_TEST_SRC_CPP = \ - ode/test/test_ode.cpp \ - ode/test/test_chain2.cpp \ - ode/test/test_hinge.cpp \ - ode/test/test_slider.cpp \ - ode/test/test_collision.cpp \ - ode/test/test_boxstack.cpp \ - ode/test/test_buggy.cpp \ - ode/test/test_crash.cpp \ - ode/test/test_joints.cpp \ - ode/test/test_space.cpp \ - ode/test/test_I.cpp \ - ode/test/test_step.cpp \ - ode/test/test_friction.cpp \ - ode/test/test_space_stress.cpp -ifdef OPCODE_DIRECTORY -ODE_TEST_SRC_CPP += \ - ode/test/test_trimesh.cpp \ - ode/test/test_moving_trimesh.cpp -endif +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS -ODE_TEST_SRC_C = \ - ode/test/test_chain1.c -DRAWSTUFF_TEST_SRC_CPP = \ - drawstuff/dstest/dstest.cpp +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique -CONFIGURATOR_SRC=configurator.c -CONFIG_H=include/ode/config.h +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here -############################################################################## -# OPCODE build rules +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -ifdef OPCODE_DIRECTORY +distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) + $(mkdir_p) $(distdir)/. + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) -ODE_SRC+=\ - OPCODE/OPC_AABBCollider.cpp \ - OPCODE/OPC_AABBTree.cpp \ - OPCODE/OPC_BaseModel.cpp \ - OPCODE/OPC_BoxPruning.cpp \ - OPCODE/OPC_Collider.cpp \ - OPCODE/OPC_Common.cpp \ - OPCODE/OPC_HybridModel.cpp \ - OPCODE/OPC_LSSCollider.cpp \ - OPCODE/OPC_MeshInterface.cpp \ - OPCODE/OPC_Model.cpp \ - OPCODE/OPC_OBBCollider.cpp \ - OPCODE/Opcode.cpp \ - OPCODE/OPC_OptimizedTree.cpp \ - OPCODE/OPC_Picking.cpp \ - OPCODE/OPC_PlanesCollider.cpp \ - OPCODE/OPC_RayCollider.cpp \ - OPCODE/OPC_SphereCollider.cpp \ - OPCODE/OPC_SweepAndPrune.cpp \ - OPCODE/OPC_TreeBuilders.cpp \ - OPCODE/OPC_TreeCollider.cpp \ - OPCODE/OPC_VolumeCollider.cpp \ - OPCODE/Ice/IceAABB.cpp \ - OPCODE/Ice/IceContainer.cpp \ - OPCODE/Ice/IceHPoint.cpp \ - OPCODE/Ice/IceIndexedTriangle.cpp \ - OPCODE/Ice/IceMatrix3x3.cpp \ - OPCODE/Ice/IceMatrix4x4.cpp \ - OPCODE/Ice/IceOBB.cpp \ - OPCODE/Ice/IcePlane.cpp \ - OPCODE/Ice/IcePoint.cpp \ - OPCODE/Ice/IceRandom.cpp \ - OPCODE/Ice/IceRay.cpp \ - OPCODE/Ice/IceRevisitedRadix.cpp \ - OPCODE/Ice/IceSegment.cpp \ - OPCODE/Ice/IceTriangle.cpp \ - OPCODE/Ice/IceUtils.cpp +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) -# GCC versions 3.X generate bad code for some modules -# with -O2, so we use -O1 until we get this tied down a bit more. -# There are at least two problematic code modules with -O2, one of -# which is OPC_TreeCollider (if you identify the other, which causes -# problems with trimesh-trimesh collisions, then let us know). -ifeq ($(CC),g++) -OPCODE/%.o: OPT=1 -endif -ifeq ($(I_AM_GCC),yes) -OPCODE/%.o: OPT=1 -endif +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) -endif +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) -############################################################################## -# derived things +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) -DEFINES= +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile $(SCRIPTS) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive -# support TriMesh/OPCODE on the compiler command line -ifdef OPCODE_DIRECTORY -DEFINES+=$(C_DEF)dTRIMESH_ENABLED -INC_OPCODE=$(C_INC)$(OPCODE_DIRECTORY) -endif +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -# add some defines depending on the build mode -ifeq ($(BUILD),release) -DEFINES+=$(C_DEF)dNODEBUG -endif +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: -# object file names -ODE_PREGEN_OBJECTS=$(ODE_PREGEN_SRC:%.c=%$(OBJ)) -ODE_OBJECTS=$(ODE_SRC:%.cpp=%$(OBJ)) $(ODE_PREGEN_OBJECTS) -DRAWSTUFF_OBJECTS=$(DRAWSTUFF_SRC:%.cpp=%$(OBJ)) $(RESOURCE_FILE) +clean-generic: -# side-effect variables causing creation of files containing lists of -# filenames to be linked, to work around command-line-length limitations -# on outdated 16-bit operating systems. because of command-line length -# limitations we cannot issue a link command with all object filenames -# specified (because this command is too long and overflows the command -# buffer), but instead must create a file containing all object filenames -# to be linked, and specify this list-file with @listfile on the command-line. -# -# the difficult part is doing this in a flexible way; we don't want to -# hard-code the to-be-linked object filenames in a file, but instead -# want to dynamically create a file containing a list of all object filenames -# within the $XXX_OBJECTS makefile variables. to do this, we use side-effect -# variables. -# -# idea: when these variables are EVALUATED (i.e. later during rule execution, -# not now during variable definition), they cause a SIDE EFFECT which creates -# a file with the list of all ODE object files. why the chicanery??? because -# if we have a command-line length limitation, no SINGLE command we issue will -# be able to create a file containing all object files to be linked -# (because that command itself would need to include all filenames, making -# it too long to be executed). instead, we must use the gnu-make "foreach" -# function, combined - probably in an unintended way - with the "shell" -# function. this is probably unintended because we are not using the "shell" -# function to return a string value for variable evaluation, but are instead -# using the "shell" function to cause a side effect (appending of each filename -# to the filename-list-file). -# -# one possible snag is that, forbidding use of any external EXE utilities and -# relying only on the facilities provided by the outdated 16-bit operating -# system, there is no way to issue a SERIES of commands which append text to -# the end of a file WITHOUT adding newlines. therefore, the list of to-be- -# linked object files is separated by newlines in the list file. fortunately, -# the linker utility for this outdated 16-bit operating system accepts -# filenames on separate lines in the list file. +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -# remember: when we evaluate these variables later, this causes the creation -# of the appropriate list file. -ifeq ($(WINDOWS16),1) -SIDE_EFFECT_ODE_OBJLIST = $(foreach o,$(ODE_OBJECTS),$(shell echo $(o) >> odeobj.txt )) -SIDE_EFFECT_DRAWSTUFF_OBJLIST = $(foreach o,$(DRAWSTUFF_OBJECTS),$(shell echo $(o) >> dsobj.txt )) -endif +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive -# library file names -ODE_LIB=$(LIBPATH)/$(LIB_PREFIX)$(ODE_LIB_NAME)$(LIB_SUFFIX) -DRAWSTUFF_LIB=$(LIBPATH)/$(LIB_PREFIX)$(DRAWSTUFF_LIB_NAME)$(LIB_SUFFIX) +clean-am: clean-generic mostlyclean-am -# executable file names -ODE_TEST_EXE=$(ODE_TEST_SRC_CPP:%.cpp=%.exe) $(ODE_TEST_SRC_C:%.c=%.exe) -DRAWSTUFF_TEST_EXE=$(DRAWSTUFF_TEST_SRC_CPP:%.cpp=%.exe) -CONFIGURATOR_EXE=$(CONFIGURATOR_SRC:%.c=%.exe) +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags -############################################################################## -# rules -# -# NOTE: the '.c' files are pregenerated sources, and must be compiled with -# -O1 optimization. that is why the rule for .c files is a bit different. -# why should it be compiled with O1? it is numerical code that is generated -# by fbuild. O1 optimization is used to preserve the operation orders that -# were discovered by fbuild to be the fastest on that platform. believe it or -# not, O2 makes this code run much slower for most compilers. +dvi: dvi-recursive -all: ode-lib drawstuff-lib ode-test drawstuff-test - @echo SUCCESS +dvi-am: -ode-lib: configure $(ODE_LIB) -drawstuff-lib: configure $(DRAWSTUFF_LIB) -ode-test: ode-lib drawstuff-lib $(ODE_TEST_EXE) -drawstuff-test: drawstuff-lib $(DRAWSTUFF_TEST_EXE) +html: html-recursive -ifndef ODE_LIB_AR_RULE -ODE_LIB_AR_RULE=$(AR)$@ -endif +info: info-recursive -$(ODE_LIB): pre_ode_lib $(ODE_OBJECTS) -ifeq ($(WINDOWS16),1) -# if we have a command-line-length limitation, then dynamically create -# a file containing all object filenames, and pass this file to the linker -# instead of directly specifying the object filenames on the command line. -# the very evaluation of the following variable causes creation of file -# odeobj.txt - $(SIDE_EFFECT_ODE_OBJLIST) - $(ODE_LIB_AR_RULE) @odeobj.txt -else -# if we have no command-line-length limitation, directly specify all -# object files to be linked. - $(ODE_LIB_AR_RULE) $(ODE_OBJECTS) -endif +info-am: -ifdef RANLIB - $(RANLIB) $@ -endif +install-data-am: -$(DRAWSTUFF_LIB): pre_drawstuff_lib $(DRAWSTUFF_OBJECTS) -ifeq ($WINDOWS16),1) -# if we have a command-line-length limitation, then do the same as above. - $(SIDE_EFFECT_DRAWSTUFF_OBJLIST) - $(AR)$@ @dsobj.txt -else -# if we have no command-line-length limitation, directly specify all object -# files to be linked. - $(AR)$@ $(DRAWSTUFF_OBJECTS) -endif -ifdef RANLIB - $(RANLIB) $@ -endif +install-exec-am: install-binSCRIPTS -# rules to be executed before library linking starts: delete list file (if one is used) +install-info: install-info-recursive -pre_ode_lib: -ifeq ($WINDOWS16),1) - $(DEL_CMD) odeobj.txt -endif +install-man: -pre_drawstuff_lib: -ifeq ($WINDOWS16),1) - $(DEL_CMD) dsobj.txt -endif +installcheck-am: -clean: - -$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) $(CONFIG_H) - -$(DEL_CMD) OPCODE/*.obj OPCODE/*.o OPCODE/Ice/*.obj OPCODE/Ice/*.o +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic -%$(OBJ): %.c - $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $< +mostlyclean: mostlyclean-recursive -%$(OBJ): %.cpp - $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $< +mostlyclean-am: mostlyclean-generic -%.exe: %$(OBJ) - $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) +pdf: pdf-recursive +pdf-am: -# windows specific rules +ps: ps-recursive -lib/resources.RES: drawstuff/src/resources.rc - $(RC_RULE) +ps-am: +uninstall-am: uninstall-binSCRIPTS uninstall-info-am -# configurator rules +uninstall-info: uninstall-info-recursive -configure: $(CONFIG_H) +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-generic \ + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binSCRIPTS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-info-am -$(CONFIG_H): $(CONFIGURATOR_EXE) $(USER_SETTINGS) $(PLATFORM_MAKEFILE) - $(THIS_DIR1)$(CONFIGURATOR_EXE) $(CONFIG_H) "$(CC) $(DEFINES) $(LINK_MATH) $(C_EXEOUT)" $(THIS_DIR2) +libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck -$(CONFIGURATOR_EXE): $(CONFIGURATOR_SRC) $(USER_SETTINGS) $(PLATFORM_MAKEFILE) - $(CC) $(C_DEF)d$(PRECISION) $(DEFINES) $(C_EXEOUT)$@ $< +# Utility rule for making a release +release: dist dist-bz2 dist-zip + @echo Created release packages for ${PACKAGE}-${VERSION}. +# Rules for creating .tar.bz2 and .zip packages +dist-bz2: ${PACKAGE}-${VERSION}.tar.gz + gzip -dc ${PACKAGE}-${VERSION}.tar.gz | bzip2 > ${PACKAGE}-${VERSION}.tar.bz2 -# unix-gcc specific dependency making - -DEP_RULE=gcc -M $(C_INC)$(INCPATH) $(DEFINES) -depend: - $(DEP_RULE) $(ODE_SRC) $(ODE_PREGEN_SRC) | tools/process_deps ode/src/ > Makefile.deps - $(DEP_RULE) $(DRAWSTUFF_SRC) | tools/process_deps drawstuff/src/ >> Makefile.deps - $(DEP_RULE) $(ODE_TEST_SRC_CPP) | tools/process_deps ode/test/ >> Makefile.deps - $(DEP_RULE) $(DRAWSTUFF_TEST_SRC_CPP) | tools/process_deps drawstuff/dstest/ >> Makefile.deps - -include Makefile.deps +dist-zip: ${PACKAGE}-${VERSION}.tar.gz + tar -zxf ${PACKAGE}-${VERSION}.tar.gz && \ + zip -r ${PACKAGE}-${VERSION}.zip ${PACKAGE}-${VERSION} && \ + rm -rf ${PACKAGE}-${VERSION} +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-04-14 15:10:38 UTC (rev 925) +++ trunk/configure.in 2006-04-14 17:23:44 UTC (rev 926) @@ -422,23 +422,28 @@ hpux9* | hpux10* | hpux11*) # taken from ltconfig so_ext=".sl" DLLDEFINE="" + SHARED_LDFLAGS="-shared" ;; cygwin* | mingw*) so_ext=".dll" DLLDEFINE="-DODE_DLL" + SHARED_LDFLAGS="-shared" ;; *apple*) # For Mac OS X so_ext=".dylib" DLLDEFINE="" + SHARED_LDFLAGS="-dylib" ;; *) so_ext=".so" DLLDEFINE="" + SHARED_LDFLAGS="-shared" ;; esac AC_MSG_RESULT($so_ext) AC_DEFINE_UNQUOTED(SO_EXT,"$so_ext",[The extension for shared libraries.]) AC_SUBST(so_ext) +AC_SUBST(SHARED_LDFLAGS) dnl Finally write our Makefiles AC_OUTPUT([ Modified: trunk/ode/src/Makefile.am =================================================================== --- trunk/ode/src/Makefile.am 2006-04-14 15:10:38 UTC (rev 925) +++ trunk/ode/src/Makefile.am 2006-04-14 17:23:44 UTC (rev 926) @@ -16,7 +16,7 @@ traplib_PROGRAMS=libode libode_SOURCES= libode_DEPENDENCIES = libfast.a libode.a -libode_LDFLAGS=-shared +libode_LDFLAGS= @SHARED_LDFLAGS@ libode_LDADD=$(libode_a_OBJECTS) $(libfast_a_OBJECTS) if OPCODE libode_DEPENDENCIES+= libOPCODE.a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
