IPAL22903: TC650: Store/Restore last GUI state does not work for Isos

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 61851d56ea45656b640e41d601a21635f6a29640..795831ae737a8b6516184f72dcb7bdc6726a390b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,29 +20,40 @@
 # 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      \
+SUBDIRS = ARCHIMEDE $(NMTDS_VAR) $(NMTTools_VAR) $(GEOMAlgo_VAR) SKETCHER OCC2VTK GEOM \
           BREPExport BREPImport IGESExport IGESImport STEPExport       \
           STEPImport STLExport VTKExport ShHealOper GEOMImpl GEOM_I    \
           GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY
 
+#if PARTITION_OLD_PACKAGING
+#  SUBDIRS += NMTDS NMTTools GEOMAlgo
+#else
+#  SUBDIRS += NMTDS_NEW NMTTools_NEW GEOMAlgo_NEW
+#endif
+#
+#  SUBDIRS += SKETCHER OCC2VTK GEOM    \
+#          BREPExport BREPImport IGESExport IGESImport STEPExport      \
+#          STEPImport STLExport VTKExport ShHealOper GEOMImpl GEOM_I   \
+#          GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY
+
 if WITH_OPENCV
   SUBDIRS += ShapeRecognition
 endif
 
 if GEOM_ENABLE_GUI
-  SUBDIRS += OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI  \
+  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\
+DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo NMTDS_NEW NMTTools_NEW GEOMAlgo_NEW \
+               SKETCHER OCC2VTK GEOM BREPExport\
                BREPImport IGESExport IGESImport STEPExport STEPImport STLExport \
                VTKExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv   \
-               GEOM_SWIG OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase   \
+               GEOM_SWIG OBJECT DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase  \
                GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI     \
                EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI    \
                RepairGUI MeasureGUI GroupGUI BlocksGUI AdvancedGUI             \
-               GEOM_SWIG_WITHIHM GEOM_PY
+               GEOM_SWIG_WITHIHM GEOM_PY ShapeRecognition