Correcting a problem araising when building the SMESH module whithout Netgen.

[modules/smesh.git] / src / SMESH / Makefile.in

diff --git a/src/SMESH/Makefile.in b/src/SMESH/Makefile.in
index a306524a06720059c281d42cd957d3a2e3dc5997..ef442ef40ece61a948208134811f878f32b4f4c8 100644 (file)
--- a/src/SMESH/Makefile.in
+++ b/src/SMESH/Makefile.in
@@ -27,9 +27,9 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
 
 
 @COMMENCE@
@@ -54,6 +54,7 @@ EXPORT_HEADERS= \
        SMESH_Quadrangle_2D.hxx \
        SMESH_MEFISTO_2D.hxx \
        SMESH_Hexa_3D.hxx \
+       SMESH_NETGEN_3D.hxx \
        SMESH_HypothesisCreator.hxx
 
 EXPORT_PYSCRIPTS =
@@ -88,12 +89,20 @@ BIN =
 BIN_SRC = 
 
 # additionnal information to compil and link file
-CPPFLAGS+= $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES)
-CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES)
+CPPFLAGS+= $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 
 #IDLCXXFLAGS+= -Wbtp
 
-LDFLAGS+=  $(OCC_LIBS) $(HDF5_LIBS) $(MED2_LIBS) -lOpUtil -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverDAT -lMeshDriverMED -lMeshDriverUNV
+LDFLAGS+= $(HDF5_LIBS) $(MED2_LIBS) -lOpUtil -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverDAT -lMeshDriverMED -lMeshDriverUNV -L${KERNEL_ROOT_DIR}/lib/salome
+
+ifeq (@WITHNETGEN@,yes)
+  LIB_SRC+= SMESH_NETGEN_3D.cxx
+  NETGEN_INCLUDES=@NETGEN_INCLUDES@
+  CPPFLAGS+= $(NETGEN_INCLUDES)
+  CXXFLAGS+= $(NETGEN_INCLUDES)
+  LDFLAGS+=  -lNETGEN
+endif
 
 @CONCLUDE@