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

diff --git a/ros/adm/make/DRAWEXE/Makefile.am b/ros/adm/make/DRAWEXE/Makefile.am
index 8e9e2c3a3a1a10e16fef847b57d2e7306bb92c39..4839a3635a053403d250f7a1752aa129b800a247 100644 (file)
--- 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 a51bf00f413e5364315155251092da195d99dd6f..6e18098ecf21f766d2afece1b9d6f972e6455fae 100644 (file)
--- 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 f82df133108bc393b5379a262e16721fb3805e9a..578901d6bbf321b75dcf3b9ea02e2fed8facc16f 100644 (file)
--- 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 e7524dc41d18a4bc002237a028f04bdc903de707..e46c5fcf6df17e79c390485772d78a592191ec35 100644 (file)
--- 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 9f3d677b26aaf9e26877ee41d07caf9e69af8e49..e0f9a770187a996347f907b531b247d37bd69857 100644 (file)
--- 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 c5a6f3d633dcc250a74770fbdcbe91cfdc7f635a..f06092adf0c7eb931c066790cecd621dfc9abda0 100644 (file)
--- 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 d8ccfc5b28cb70223c79cfc331d07f1e0b45d49b..c71cd6a8c69c6e33c8a1176153360231f1eff47a 100644 (file)
--- 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 002ddf6cfb5eef8c063c8c366fc8120b8249bf8e..482f1604d063306bc07f61567e85b59c0d4b3d79 100644 (file)
--- 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