Merge from V6_main 28/02/2013

[modules/kernel.git] / resources / Makefile.am

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 336a0caebeb3c46e4b404869077cc6305c6b3805..1881203ef4d80f461ed5d665ee5b4e8a883fb7f2 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,24 +1,25 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # -* Makefile *- 
 # Author : Guillaume Boulant (CSSI)
 # Module : KERNEL 
@@ -34,13 +35,21 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 if WITHONLYLAUNCHER
   dist_salomeres_DATA=\
-       CatalogResources.xml \
        CatalogModulePersonnel.xml_skel
+
+  # VSR: little trick to avoid putting if generated files to the distribution archive
+  nodist_salomeres_DATA=\
+       CatalogResources.xml
 else
   dist_salomeres_DATA=\
-       CatalogResources.xml \
        CatalogModulePersonnel.xml_skel \
        channel.cfg \
-       KERNELCatalog.xml \
        SALOMEDS_Resources 
+
+  # VSR: little trick to avoid putting if generated files to the distribution archive
+  nodist_salomeres_DATA=\
+       CatalogResources.xml \
+       KERNELCatalog.xml
 endif
+
+EXTRA_DIST += CatalogDataType.xml