[Hdrflow-svn] SF.net SVN: hdrflow: [382] trunk/lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [382] trunk/lib/openlibraries
|
From: <gl...@us...> - 2007-11-10 21:14:26
|
Revision: 382
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=382&view=rev
Author: glslang
Date: 2007-11-10 13:14:24 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
+ removes all RPATH references
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/m4/boost.m4
trunk/lib/openlibraries/m4/glew.m4
trunk/lib/openlibraries/m4/openal.m4
trunk/lib/openlibraries/m4/openimagelib.m4
trunk/lib/openlibraries/m4/qt.m4
trunk/lib/openlibraries/m4/universal_binary.m4
trunk/lib/openlibraries/openlibraries.pc.in
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am
trunk/lib/openlibraries/src/openassetlib/py/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
trunk/lib/openlibraries/src/openimagelib/py/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
trunk/lib/openlibraries/src/openmedialib/py/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am
trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am
trunk/lib/openlibraries/test/openmedialib/player/Makefile.am
trunk/lib/openlibraries/test/openmedialib/store/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/rdtsc/Makefile.am
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/configure.ac 2007-11-10 21:14:24 UTC (rev 382)
@@ -303,33 +303,6 @@
AC_SUBST(OPENASSETLIB_PLUGINPATH)
AC_SUBST(OPENPLUGINLIB_LIBPATH)
-#
-# RPATHS
-#
-
-case $host in
- *-*-linux*)
- OPENPLUGINLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openpluginlib/$OL_LIBNAME"
- OPENIMAGELIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openimagelib/$OL_LIBNAME"
- OPENMEDIALIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openmedialib/$OL_LIBNAME"
- OPENOBJECTLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openobjectlib/$OL_LIBNAME"
- OPENASSETLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openassetlib/$OL_LIBNAME"
- ;;
- *)
- OPENPLUGINLIB_RPATH=""
- OPENIMAGELIB_RPATH=""
- OPENMEDIALIB_RPATH=""
- OPENOBJECTLIB_RPATH=""
- OPENASSETLIB_RPATH=""
- ;;
-esac
-
-AC_SUBST(OPENPLUGINLIB_RPATH)
-AC_SUBST(OPENIMAGELIB_RPATH)
-AC_SUBST(OPENMEDIALIB_RPATH)
-AC_SUBST(OPENOBJECTLIB_RPATH)
-AC_SUBST(OPENASSETLIB_RPATH)
-
dnl
dnl Output configuration files
dnl
Modified: trunk/lib/openlibraries/m4/boost.m4
===================================================================
--- trunk/lib/openlibraries/m4/boost.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/boost.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -14,7 +14,6 @@
BOOST_INCLUDE_PATH=""
BOOST_LIB_PATH=""
- BOOST_LIB_RPATH=""
AS_IF([test "x$with_boostversion" == "x"],
AC_MSG_WARN([*** Boost version is not defined. Will use system defaults. ***])
@@ -48,12 +47,6 @@
BOOST_LIB_PATH="-L$with_boostprefix/$OL_LIBNAME"
,,)
- case $host in
- *-*-linux*)
- BOOST_LIB_RPATH="-Wl,-rpath=$with_boostprefix/$OL_LIBNAME"
- ;;
- esac
-
BOOST_LIBNAMESUFFIX="$BOOST_LIB_TOOLSET$BOOST_LIB_RUNTIME$BOOST_LIB_VERSION"
BOOST_FILESYSTEM_LIBS="-lboost_filesystem$BOOST_LIB_TOOLSET$BOOST_LIB_RUNTIME$BOOST_LIB_VERSION"
@@ -91,7 +84,6 @@
AC_SUBST(BOOST_LIB_TOOLSET)
AC_SUBST(BOOST_INCLUDE_PATH)
AC_SUBST(BOOST_LIB_PATH)
- AC_SUBST(BOOST_LIB_RPATH)
AC_SUBST(BOOST_FILESYSTEM_LIBS)
AM_CONDITIONAL(HAVE_BOOST_FILESYSTEM, [test x$ac_use_boost_filesystem = "xyes"])
Modified: trunk/lib/openlibraries/m4/glew.m4
===================================================================
--- trunk/lib/openlibraries/m4/glew.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/glew.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -14,7 +14,6 @@
GLEW_PREFIX="$with_glewprefix"
GLEW_INCLUDE_PATH=""
GLEW_LIB_PATH=""
- GLEW_LIB_RPATH=""
GLEW_LIBS=""
if test x$enableglew = "xyes" ; then
@@ -33,21 +32,12 @@
[ac_have_glew="yes" GLEW_LIBS="-lGLEW" AC_DEFINE(HAVE_GL_GLEW_H, 1,[Define this if you have GLEW support])],
[AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])])]
- LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[])
-
- if test x$ac_have_glew = "xyes"; then
- ac_use_glew=yes
- case $host in
- *-*-linux*)
- GLEW_LIB_RPATH="-Wl,-rpath=$with_glewprefix/$OL_LIBNAME"
- esac
- fi
+ LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[])
fi
AC_SUBST(GLEW_PREFIX)
AC_SUBST(GLEW_INCLUDE_PATH)
AC_SUBST(GLEW_LIB_PATH)
- AC_SUBST(GLEW_LIB_RPATH)
AC_SUBST(GLEW_LIBS)
if test x$ac_use_glew = "xyes"; then
Modified: trunk/lib/openlibraries/m4/openal.m4
===================================================================
--- trunk/lib/openlibraries/m4/openal.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/openal.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -18,7 +18,6 @@
OPENAL_PREFIX="$with_openalprefix"
OPENAL_INCLUDE_PATH=""
OPENAL_LIB_PATH=""
- OPENAL_LIB_RPATH=""
OPENAL_LIBS=""
if test x$enableopenal = "xyes" ; then
@@ -66,7 +65,6 @@
AC_SUBST(OPENAL_INCLUDE_PATH)
AC_SUBST(OPENAL_LIB_PATH)
- AC_SUBST(OPENAL_LIB_RPATH)
AC_SUBST(OPENAL_LIBS)
AM_CONDITIONAL(HAVE_OPENAL, [test x$ac_use_openal = "xyes"])
Modified: trunk/lib/openlibraries/m4/openimagelib.m4
===================================================================
--- trunk/lib/openlibraries/m4/openimagelib.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/openimagelib.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -21,6 +21,7 @@
AC_MSG_RESULT([*** PNG support is not available ***]))
else
PNG_CFLAGS=`$LIBPNG_CONFIG --cflags`
+ PNG_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
PNG_LIBS=`$LIBPNG_CONFIG --libs`
have_libpng="yes"
AC_DEFINE(HAVE_LIBPNG,1,[Define this for PNG support])
@@ -28,6 +29,7 @@
AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes")
AC_SUBST(PNG_CFLAGS)
+ AC_SUBST(PNG_LDFLAGS)
AC_SUBST(PNG_LIBS)
dnl libjpeg support
Modified: trunk/lib/openlibraries/m4/qt.m4
===================================================================
--- trunk/lib/openlibraries/m4/qt.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/qt.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -9,15 +9,8 @@
QT_INCLUDE_PATH="-I${with_qtinclude}"
QT_LIB_PATH="-L${with_qtlib}"
- QT_LIB_RPATH=""
QT_LIBS=""
- case $host in
- *-*-linux*)
- QT_LIB_RPATH="-Wl,-rpath=${with_qtlib}"
- ;;
- esac
-
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS ${QT_INCLUDE_PATH}"
@@ -52,7 +45,6 @@
AC_SUBST(QT_INCLUDE_PATH)
AC_SUBST(QT_LIB_PATH)
- AC_SUBST(QT_LIB_RPATH)
AC_SUBST(QT_LIBS)
AM_CONDITIONAL(HAVE_QT, [test x$ac_use_qt = "xyes"])
Modified: trunk/lib/openlibraries/m4/universal_binary.m4
===================================================================
--- trunk/lib/openlibraries/m4/universal_binary.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/universal_binary.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,7 +16,7 @@
AC_MSG_ERROR([--enable-universalbinaries requires --disable-dependency-tracking])
fi
AC_MSG_RESULT(yes)
- CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+ CXXFLAGS="$CXXFLAGS -arch ppc -arch i386"
else
AC_MSG_RESULT(no)
fi
Modified: trunk/lib/openlibraries/openlibraries.pc.in
===================================================================
--- trunk/lib/openlibraries/openlibraries.pc.in 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/openlibraries.pc.in 2007-11-10 21:14:24 UTC (rev 382)
@@ -18,9 +18,7 @@
Description: OpenLibraries - a library suite for non-linear editing, visual effects and rich media applications.
Version: @OL_MAJOR@.@OL_MINOR@.@OL_SUB@
-Libs: @OPENPLUGINLIB_RPATH@ @OPENIMAGELIB_RPATH@ @OPENMEDIALIB_RPATH@ @OPENOBJECTLIB_RPATH@ \
- @OPENASSETLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ \
- -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
+Libs:-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openimagelib/@OL_LIBNAME@ -lopenimagelib_il \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openmedialib/@OL_LIBNAME@ -lopenmedialib_ml \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openpluginlib/@OL_LIBNAME@ -lopenpluginlib_pl \
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -32,7 +32,6 @@
libopenassetlib_sqlite3_plugin_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenassetlib_sqlite3_plugin_ladir = $(OPENASSETLIB_PLUGINPATH)
Modified: trunk/lib/openlibraries/src/openassetlib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openassetlib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -32,7 +32,6 @@
libopenassetlib_py_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,16 +13,17 @@
libopenimagelib_png_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
+ $(PNG_CFLAGS) \
$(BOOST_INCLUDE_PATH) \
-DIL_EXPORTS
libopenimagelib_png_la_LIBADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- $(PNG_LIBS)
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_png_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
+ $(PNG_LDFLAGS) \
$(BOOST_LIB_PATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
Modified: trunk/lib/openlibraries/src/openimagelib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openimagelib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -26,7 +26,6 @@
libopenimagelib_py_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -28,9 +28,7 @@
libopenmedialib_openal_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
$(OPENAL_LIB_PATH) \
- $(OPENAL_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_openal_ladir = $(OPENMEDIALIB_PLUGINPATH)
Modified: trunk/lib/openlibraries/src/openmedialib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openmedialib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -26,7 +26,6 @@
libopenmedialib_py_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -57,8 +57,6 @@
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
$(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openobjectlib/sg
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -93,8 +93,6 @@
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
$(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openpluginlib/pl
Modified: trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -46,8 +46,6 @@
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
$(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -15,8 +15,7 @@
tm_bench_LDFLAGS = \
$(OLIB_LDFLAGS) \
- $(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH)
+ $(BOOST_LIB_PATH)
tm_bench_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_compressed_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_compressed_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_compressed_cubemap_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_compressed_cubemap_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_crop_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_crop_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_crop2_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_crop2_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_exr_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_exr_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
_2D_scale_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_scale_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_sgi_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_sgi_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openmedialib/player/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/player/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openmedialib/player/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,9 +13,7 @@
player_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
player_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openmedialib/store/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/store/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openmedialib/store/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -10,8 +10,7 @@
-DOPENMEDIALIB_PLUGINS=\"$(OPENMEDIALIB_PLUGINPATH)\"
store_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
store_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
-DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\"
multipass_draw_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
multipass_draw_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
-DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\"
noise_volume_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
noise_volume_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
-DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\"
obj_draw_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
obj_draw_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -15,9 +15,7 @@
$(OIL_CXXFLAGS)
texture_draw_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
texture_draw_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
discovery_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
discovery_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
enumerate_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
enumerate_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -15,9 +15,7 @@
gettimeofday_LDFLAGS = \
$(OLIB_LDFLAGS) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
gettimeofday_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
gpu_timer_query_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
gpu_timer_query_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -14,8 +14,7 @@
# end
initialization_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
initialization_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
key_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
key_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
property_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
property_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
property_container_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
property_container_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
subjectobserver_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
subjectobserver_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/rdtsc/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/rdtsc/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/rdtsc/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -15,9 +15,7 @@
rdtsc_LDFLAGS = \
$(OLIB_LDFLAGS) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
rdtsc_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
