mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-02-05 14:24:17 +05:00
Fix executable linking problem
This commit is contained in:
parent
99a51e20d4
commit
dd99d6e2d8
14
Makefile.in
14
Makefile.in
@ -28,7 +28,7 @@
|
|||||||
top_srcdir=@top_srcdir@
|
top_srcdir=@top_srcdir@
|
||||||
top_builddir=.
|
top_builddir=.
|
||||||
srcdir=@srcdir@
|
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@
|
@COMMENCE@
|
||||||
@ -168,16 +168,23 @@ mesh_conv_to_quad.png
|
|||||||
BIN_SCRIPT= \
|
BIN_SCRIPT= \
|
||||||
VERSION
|
VERSION
|
||||||
|
|
||||||
|
# copy header files in common directory
|
||||||
|
|
||||||
include_list = include/salome/SALOMEconfig.h \
|
include_list = include/salome/SALOMEconfig.h \
|
||||||
include/salome/SMESH_version.h
|
include/salome/SMESH_version.h
|
||||||
|
|
||||||
# copy header files in common directory
|
|
||||||
ifneq ($(HAVE_SSTREAM),yes)
|
ifneq ($(HAVE_SSTREAM),yes)
|
||||||
include_list += include/salome/sstream
|
include_list += include/salome/sstream
|
||||||
endif
|
endif
|
||||||
|
|
||||||
inc: idl $(include_list)
|
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
|
include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
|
||||||
-$(RM) $@
|
-$(RM) $@
|
||||||
$(LN_S) ../../$< $@
|
$(LN_S) ../../$< $@
|
||||||
@ -196,7 +203,8 @@ include/salome/sstream: salome_adm/unix/sstream
|
|||||||
$(LN_S) ../../$< $@
|
$(LN_S) ../../$< $@
|
||||||
|
|
||||||
include/salome/SMESH_version.h: SMESH_version.h
|
include/salome/SMESH_version.h: SMESH_version.h
|
||||||
cp $< $@
|
-$(RM) $@
|
||||||
|
$(LN_S) ../../$< $@
|
||||||
|
|
||||||
depend: depend_idl
|
depend: depend_idl
|
||||||
|
|
||||||
|
@ -90,7 +90,12 @@ LDFLAGS += $(OCC_KERNEL_LIBS) \
|
|||||||
-lSALOMELocalTrace \
|
-lSALOMELocalTrace \
|
||||||
-lSALOMEBasics \
|
-lSALOMEBasics \
|
||||||
-lOpUtil \
|
-lOpUtil \
|
||||||
-lTKShHealing
|
-lTKShHealing \
|
||||||
|
-lMeshDriverDAT \
|
||||||
|
-lMeshDriverSTL \
|
||||||
|
-lMeshDriverMED \
|
||||||
|
-lMeshDriverUNV \
|
||||||
|
-lMeshDriver
|
||||||
|
|
||||||
LDFLAGSFORBIN += $(LDFLAGS)
|
LDFLAGSFORBIN += $(LDFLAGS)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user