Merge from V6_main 01/04/2013

[plugins/hybridplugin.git] / src / GHS3DPlugin / Makefile.am

diff --git a/src/GHS3DPlugin/Makefile.am b/src/GHS3DPlugin/Makefile.am
index a76182600d2a1a4a8989dad727bf3d6dab3f1213..f6a90059cbaf4256d4917ffeeb9123fc3349f311 100644 (file)
--- a/src/GHS3DPlugin/Makefile.am
+++ b/src/GHS3DPlugin/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2004-2013  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
 salomeinclude_HEADERS = \
-       libmesh5.h \
        GHS3DPlugin_Defs.hxx \
        GHS3DPlugin_GHS3D.hxx \
        GHS3DPlugin_GHS3D_i.hxx \
@@ -38,7 +37,6 @@ salomeinclude_HEADERS = \
 lib_LTLIBRARIES = libGHS3DEngine.la
 
 dist_libGHS3DEngine_la_SOURCES = \
-  libmesh5.c \
   GHS3DPlugin_GHS3D.cxx \
   GHS3DPlugin_GHS3D_i.cxx \
   GHS3DPlugin_i.cxx \
@@ -46,22 +44,22 @@ dist_libGHS3DEngine_la_SOURCES = \
   GHS3DPlugin_Hypothesis_i.cxx
 
 libGHS3DEngine_la_CPPFLAGS =  \
-  $(KERNEL_CXXFLAGS)    \
-  $(CAS_CPPFLAGS)       \
-  $(GEOM_CXXFLAGS)      \
-  $(MED_CXXFLAGS)       \
-  $(SMESH_CXXFLAGS)     \
-  $(VTK_INCLUDES) \
-  $(BOOST_CPPFLAGS)     \
-  $(CORBA_CXXFLAGS)     \
-  $(CORBA_INCLUDES)     \
-  -I$(top_builddir)/idl
+       $(KERNEL_CXXFLAGS)    \
+       $(CAS_CPPFLAGS)       \
+       $(GEOM_CXXFLAGS)      \
+       $(MED_CXXFLAGS)       \
+       $(SMESH_CXXFLAGS)     \
+       $(VTK_INCLUDES) \
+       $(BOOST_CPPFLAGS)     \
+       $(CORBA_CXXFLAGS)     \
+       $(CORBA_INCLUDES)     \
+       -I$(top_builddir)/idl
 
 libGHS3DEngine_la_LDFLAGS  = \
   ../../idl/libSalomeIDLGHS3DPLUGIN.la \
   $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo -lTKCDF \
   $(MED_LDFLAGS) -lSalomeIDLMED \
-  $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS -lStdMeshers \
+  $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS -lStdMeshers -lMeshDriverGMF \
   $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics -lSalomeNS -lOpUtil
 
 # Scripts to be installed.