Fix Numpy version conflict when using custom Numpy with System Python and that anothe...

[modules/kernel.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2dd472d1e7b8306bb26fa133c83893d35b38b0bf..abfd02f99af79dd4f2fc3fa5484976bbf1729bd3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,23 @@
-#  Copyright (C) 2007-2010  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 *- 
@@ -26,7 +26,7 @@
 # $Header$
 #
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
-
+#
 if CORBA_GEN
   IDLDIR = idl
 endif
@@ -36,16 +36,18 @@ ACLOCAL_AMFLAGS = -I salome_adm/unix/config_files
 if WITHONLYLAUNCHER
   SUBDIRS = src resources
 else
-  SUBDIRS = salome_adm $(IDLDIR) src doc bin resources
+  SUBDIRS = salome_adm $(IDLDIR) src bin doc resources
 endif
 
 DIST_SUBDIRS= salome_adm idl src doc bin resources
 
-DISTCLEANFILES = a.out local-install.sh
+DISTCLEANFILES = a.out local-install.sh hack_libtool aclocal.m4 configure salome_adm/unix/config_files/config.guess salome_adm/unix/config_files/config.sub salome_adm/unix/config_files/depcomp salome_adm/unix/config_files/install-sh salome_adm/unix/config_files/libtool.m4 salome_adm/unix/config_files/ltmain.sh salome_adm/unix/config_files/ltoptions.m4 salome_adm/unix/config_files/ltsugar.m4 salome_adm/unix/config_files/ltversion.m4 salome_adm/unix/config_files/lt~obsolete.m4 salome_adm/unix/config_files/missing salome_adm/unix/config_files/py-compile
 
 salomeinclude_DATA = KERNEL_version.h
 
-EXTRA_DIST = \
+EXTRA_DIST += \
+       build_cmake \
+       build_cmake.bat \
        build_configure \
        clean_configure \
        LICENCE \