From 34ca6ba25aba1b3d6783e8ae8e2eaebb2d1d7b3f Mon Sep 17 00:00:00 2001 From: Debian Science Maintainers Date: Fri, 6 May 2011 14:52:41 +0100 Subject: [PATCH] make-draw-libs-private Remove sonames so that dlopen works even if -dev package is not installed. Move DRAW plug-ins into /usr/lib/opencas, these are private plug-ins and not shared libraries. Put rpath information into DRAWEXE to make it find plug-ins without hacking source files. Gbp-Pq: Name make-draw-libs-private.patch --- ros/adm/make/DRAWEXE/Makefile.am | 1 + ros/adm/make/TKDCAF/Makefile.am | 4 ++-- ros/adm/make/TKDraw/Makefile.am | 4 ++-- ros/adm/make/TKTObjDRAW/Makefile.am | 4 ++-- ros/adm/make/TKTopTest/Makefile.am | 4 ++-- ros/adm/make/TKViewerTest/Makefile.am | 4 ++-- ros/adm/make/TKXDEDRAW/Makefile.am | 4 ++-- ros/adm/make/TKXSDRAW/Makefile.am | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ros/adm/make/DRAWEXE/Makefile.am b/ros/adm/make/DRAWEXE/Makefile.am index 8e9e2c3a3..4839a3635 100644 --- a/ros/adm/make/DRAWEXE/Makefile.am +++ b/ros/adm/make/DRAWEXE/Makefile.am @@ -24,3 +24,4 @@ bin_PROGRAMS= DRAWEXE ../TKernel/libTKernel.la \ ../TKService/libTKService.la \ $(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_gdi32_LIB) $(CSF_advapi32_LIB) $(CSF_user32_LIB) $(CSF_TBB_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_kernel32_LIB) $(CSF_MotifLibs_LIB) $(CSF_XwLibs_LIB) $(CSF_dpsLibs_LIB) $(CSF_XmuLibs_LIB) $(CSF_FreeImagePlus_LIB) + DRAWEXE_LDFLAGS = -rpath /usr/lib/opencas diff --git a/ros/adm/make/TKDCAF/Makefile.am b/ros/adm/make/TKDCAF/Makefile.am index a51bf00f4..6e18098ec 100644 --- a/ros/adm/make/TKDCAF/Makefile.am +++ b/ros/adm/make/TKDCAF/Makefile.am @@ -26,7 +26,7 @@ INCLUDES = $(STLPort_INCLUDES) \ -I@top_srcdir@/drv/DrawDim -I@top_srcdir@/src/DrawDim -lib_LTLIBRARIES=libTKDCAF.la +pkglib_LTLIBRARIES=libTKDCAF.la libTKDCAF_la_LIBADD = \ ../TKernel/libTKernel.la \ @@ -121,5 +121,5 @@ libTKDCAF_la_SOURCES = \ @top_srcdir@/src/DrawDim/DrawDim_PlanarRadius.cxx \ @top_srcdir@/src/DrawDim/DrawDim_Radius.cxx -libTKDCAF_la_LDFLAGS = -release 6.5.0 +libTKDCAF_la_LDFLAGS = -avoid-version diff --git a/ros/adm/make/TKDraw/Makefile.am b/ros/adm/make/TKDraw/Makefile.am index f82df1331..578901d6b 100644 --- a/ros/adm/make/TKDraw/Makefile.am +++ b/ros/adm/make/TKDraw/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = $(STLPort_INCLUDES) $(CSF_TclLibs_INCLUDES) $(CSF_TclTkLibs_INCLUDES) -I@top_srcdir@/drv/DrawTrSurf -I@top_srcdir@/src/DrawTrSurf -lib_LTLIBRARIES=libTKDraw.la +pkglib_LTLIBRARIES=libTKDraw.la libTKDraw_la_LIBADD = \ ../TKernel/libTKernel.la \ @@ -116,5 +116,5 @@ libTKDraw_la_SOURCES = \ @top_srcdir@/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx \ @top_srcdir@/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx -libTKDraw_la_LDFLAGS = -release 6.5.0 +libTKDraw_la_LDFLAGS = -avoid-version diff --git a/ros/adm/make/TKTObjDRAW/Makefile.am b/ros/adm/make/TKTObjDRAW/Makefile.am index e7524dc41..e46c5fcf6 100644 --- a/ros/adm/make/TKTObjDRAW/Makefile.am +++ b/ros/adm/make/TKTObjDRAW/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = $(STLPort_INCLUDES) \ -I@top_srcdir@/drv/TObjDRAW -I@top_srcdir@/src/TObjDRAW -lib_LTLIBRARIES=libTKTObjDRAW.la +pkglib_LTLIBRARIES=libTKTObjDRAW.la libTKTObjDRAW_la_LIBADD = \ ../TKTObj/libTKTObj.la \ @@ -31,5 +31,5 @@ $(STLPort_LIB) libTKTObjDRAW_la_SOURCES = \ @top_srcdir@/src/TObjDRAW/TObjDRAW.cxx -libTKTObjDRAW_la_LDFLAGS = -release 6.5.0 +libTKTObjDRAW_la_LDFLAGS = -avoid-version diff --git a/ros/adm/make/TKTopTest/Makefile.am b/ros/adm/make/TKTopTest/Makefile.am index 9f3d677b2..e0f9a7701 100644 --- a/ros/adm/make/TKTopTest/Makefile.am +++ b/ros/adm/make/TKTopTest/Makefile.am @@ -34,7 +34,7 @@ INCLUDES = $(STLPort_INCLUDES) \ -I@top_srcdir@/drv/BOPTest -I@top_srcdir@/src/BOPTest -lib_LTLIBRARIES=libTKTopTest.la +pkglib_LTLIBRARIES=libTKTopTest.la libTKTopTest_la_LIBADD = \ ../TKernel/libTKernel.la \ @@ -159,5 +159,5 @@ libTKTopTest_la_SOURCES = \ @top_srcdir@/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx \ @top_srcdir@/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx -libTKTopTest_la_LDFLAGS = -release 6.5.0 +libTKTopTest_la_LDFLAGS = -avoid-version diff --git a/ros/adm/make/TKViewerTest/Makefile.am b/ros/adm/make/TKViewerTest/Makefile.am index c5a6f3d63..f06092adf 100644 --- a/ros/adm/make/TKViewerTest/Makefile.am +++ b/ros/adm/make/TKViewerTest/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = $(STLPort_INCLUDES) $(CSF_TclLibs_INCLUDES) $(CSF_TclTkLibs_INCLUDES) -I@top_srcdir@/drv/ViewerTest -I@top_srcdir@/src/ViewerTest -lib_LTLIBRARIES=libTKViewerTest.la +pkglib_LTLIBRARIES=libTKViewerTest.la libTKViewerTest_la_LIBADD = \ ../TKernel/libTKernel.la \ @@ -71,5 +71,5 @@ libTKViewerTest_la_SOURCES = \ @top_srcdir@/src/ViewerTest/ViewerTest_ViewerCommands.cxx \ @top_srcdir@/src/ViewerTest/ViewerTest_VoxelCommands.cxx -libTKViewerTest_la_LDFLAGS = -release 6.5.0 +libTKViewerTest_la_LDFLAGS = -avoid-version diff --git a/ros/adm/make/TKXDEDRAW/Makefile.am b/ros/adm/make/TKXDEDRAW/Makefile.am index d8ccfc5b2..c71cd6a8c 100644 --- a/ros/adm/make/TKXDEDRAW/Makefile.am +++ b/ros/adm/make/TKXDEDRAW/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = $(STLPort_INCLUDES) \ -I@top_srcdir@/drv/XDEDRAW -I@top_srcdir@/src/XDEDRAW -lib_LTLIBRARIES=libTKXDEDRAW.la +pkglib_LTLIBRARIES=libTKXDEDRAW.la libTKXDEDRAW_la_LIBADD = \ ../TKernel/libTKernel.la \ @@ -53,5 +53,5 @@ libTKXDEDRAW_la_SOURCES = \ @top_srcdir@/src/XDEDRAW/XDEDRAW_Props.cxx \ @top_srcdir@/src/XDEDRAW/XDEDRAW_Shapes.cxx -libTKXDEDRAW_la_LDFLAGS = -release 6.5.0 +libTKXDEDRAW_la_LDFLAGS = -avoid-version diff --git a/ros/adm/make/TKXSDRAW/Makefile.am b/ros/adm/make/TKXSDRAW/Makefile.am index 002ddf6cf..482f1604d 100644 --- a/ros/adm/make/TKXSDRAW/Makefile.am +++ b/ros/adm/make/TKXSDRAW/Makefile.am @@ -24,7 +24,7 @@ INCLUDES = $(STLPort_INCLUDES) \ -I@top_srcdir@/drv/XSDRAWSTLVRML -I@top_srcdir@/src/XSDRAWSTLVRML -lib_LTLIBRARIES=libTKXSDRAW.la +pkglib_LTLIBRARIES=libTKXSDRAW.la libTKXSDRAW_la_LIBADD = \ ../TKernel/libTKernel.la \ @@ -81,5 +81,5 @@ libTKXSDRAW_la_SOURCES = \ @top_srcdir@/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cxx \ @top_srcdir@/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cxx -libTKXSDRAW_la_LDFLAGS = -release 6.5.0 +libTKXSDRAW_la_LDFLAGS = -avoid-version -- 2.30.2