X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=795831ae737a8b6516184f72dcb7bdc6726a390b;hb=392db299f788946e7276fdb4e3384cef837be9b4;hp=243974ffac4537a73777ba98588dc6713d278863;hpb=6b5338608138024483159f04f7f051ba91ae2722;p=modules%2Fgeom.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 243974ffa..795831ae7 100644
--- 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,28 +20,39 @@
 # 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 		\