Merge from V6_main_20120808 08Aug12

[modules/homard.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 49498a471769c7b6c4fb2b90fb81dabcac9f2e6b..39df6985abaf1c5a6853b6c616d1084e3108df5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,22 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2011-2012  CEA/DEN, EDF R&D
 #
-#  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 : Patrick GOLDBRONN (CEA)
 # Date : 28/06/2001
@@ -26,17 +24,19 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-ACLOCAL_AMFLAGS = -I $(top_srcdir)/adm_local/unix/config_files                 \
+ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                   -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
                   -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-                  -I ${HOMARD_SRC}/adm_local/unix/config_files
-
-SUBDIRS = idl resources src doc tests
+                 -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                 -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+                               
+SUBDIRS = idl adm_local resources src bin doc tests
 
-DIST_SUBDIRS = idl resources src doc tests
+DIST_SUBDIRS = idl adm_local resources src bin doc tests
 
-DISTCLEANFILES = a.out aclocal.m4 configure
+DISTCLEANFILES = a.out aclocal.m4 configure hack_libtool
 
+salomeinclude_DATA = HOMARD_version.h
 
 EXTRA_DIST +=          \
        build_configure \