Merge from V6_main 11/02/2013

[modules/geom.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 862b90287f22926c537a546159ef96ee3e5ae3f8..e81e3bfd9ff5565c0f716af280812a3a6d01f544 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,15 +15,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 # File    : Makefile.am
 # Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
 # Package : src (source files directory)
 
-SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER OCC2VTK GEOM      \
-          BREPExport BREPImport IGESExport IGESImport STEPExport       \
-          STEPImport STLExport VTKExport ShHealOper GEOMImpl GEOM_I    \
+SUBDIRS = ARCHIMEDE NMTDS NMTTools BlockFix GEOMAlgo SKETCHER OCC2VTK GEOM     \
+          BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport    \
+          STLExport VTKExport ShHealOper GEOMUtils GEOMImpl GEOM_I             \
           GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY
 
 if WITH_OPENCV
@@ -31,18 +30,18 @@ if WITH_OPENCV
 endif
 
 if GEOM_ENABLE_GUI
-  SUBDIRS += OBJECT DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase GEOMToolsGUI \
-             DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI \
-             BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI    \
-             GroupGUI BlocksGUI AdvancedGUI GEOM_SWIG_WITHIHM
+  SUBDIRS += OBJECT DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase      \
+             GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI       \
+             EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI      \
+             RepairGUI MeasureGUI GroupGUI BlocksGUI AdvancedGUI GEOM_SWIG_WITHIHM
 endif
 
-DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo \
-               SKETCHER OCC2VTK GEOM BREPExport \
-               BREPImport IGESExport IGESImport STEPExport STEPImport STLExport \
-               VTKExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv   \
-               GEOM_SWIG OBJECT DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase  \
+DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools BlockFix GEOMAlgo SKETCHER             \
+               OCC2VTK GEOM BREPExport BREPImport IGESExport IGESImport                \
+               STEPExport STEPImport STLExport VTKExport ShHealOper GEOMUtils  \
+               GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG OBJECT       \
+               DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase           \
                GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI     \
                EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI    \
-               RepairGUI MeasureGUI GroupGUI BlocksGUI AdvancedGUI             \
+               RepairGUI MeasureGUI GroupGUI BlocksGUI AdvancedGUI             \
                GEOM_SWIG_WITHIHM GEOM_PY ShapeRecognition