From: vsr <vsr@opencascade.com>
Date: Fri, 26 May 2006 12:17:24 +0000 (+0000)
Subject: Fix executable linking problem
X-Git-Tag: V3_2_0rc~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dd99d6e2d86ff47cefc17657b7ff6f17d18f65ba;p=modules%2Fsmesh.git

Fix executable linking problem
---

diff --git a/Makefile.in b/Makefile.in
index 2c8ff8b11..99141bc32 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 
 @COMMENCE@
@@ -168,16 +168,23 @@ mesh_conv_to_quad.png
 BIN_SCRIPT= \
 VERSION
 
+# copy header files in common directory
+
 include_list = include/salome/SALOMEconfig.h \
                include/salome/SMESH_version.h
 
-# copy header files in common directory
 ifneq ($(HAVE_SSTREAM),yes)
 	include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
 
+bin: bin/salome/VERSION
+
+bin/salome/VERSION : bin/VERSION
+	-$(RM) $@
+	$(LN_S) ../../$< $@
+
 include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
 	-$(RM) $@
 	$(LN_S) ../../$< $@
@@ -196,7 +203,8 @@ include/salome/sstream: salome_adm/unix/sstream
 	$(LN_S) ../../$< $@
 
 include/salome/SMESH_version.h: SMESH_version.h
-	cp $< $@
+	-$(RM) $@
+	$(LN_S) ../../$< $@
 
 depend: depend_idl
 
diff --git a/src/SMESHClient/Makefile.in b/src/SMESHClient/Makefile.in
index 202214e45..743358ef2 100644
--- a/src/SMESHClient/Makefile.in
+++ b/src/SMESHClient/Makefile.in
@@ -90,7 +90,12 @@ LDFLAGS  += $(OCC_KERNEL_LIBS) \
 	-lSALOMELocalTrace \
 	-lSALOMEBasics \
 	-lOpUtil \
-	-lTKShHealing
+	-lTKShHealing \
+	-lMeshDriverDAT \
+	-lMeshDriverSTL \
+	-lMeshDriverMED \
+	-lMeshDriverUNV \
+	-lMeshDriver
 
 LDFLAGSFORBIN += $(LDFLAGS)