Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CCAR: problem with an endless loop in getAIS
[modules/geom.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5242cf83febd4f347fb2b44339e1e92197a96f37..7805363def13d50b4c0983722a7aaee4e3f521b6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,7
+1,4
@@
-# Copyright (C) 2007-2008 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) 2007-2010 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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-19,6
+16,7
@@
#
# 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
# -* Makefile *-
# Author : Patrick GOLDBRONN (CEA)
# Date : 28/06/2001
@@
-28,8
+26,8
@@
include $(top_srcdir)/adm_local/unix/make_common_starter.am
if GEOM_ENABLE_GUI
ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
if GEOM_ENABLE_GUI
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 ${
GUI_ROOT_DIR}/adm_local
/unix/config_files \
+ -I ${
KERNEL_ROOT_DIR}/salome_adm
/unix/config_files
else !GEOM_ENABLE_GUI
ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
else !GEOM_ENABLE_GUI
ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
@@
-39,7
+37,7
@@
SUBDIRS = idl adm_local resources src doc bin
DIST_SUBDIRS = idl adm_local resources src doc bin
DIST_SUBDIRS = idl adm_local resources src doc bin
-DISTCLEANFILES = a.out aclocal.m4 configure
+DISTCLEANFILES = a.out aclocal.m4 configure
local-install.sh hack_libtool
salomeinclude_DATA = GEOM_version.h
salomeinclude_DATA = GEOM_version.h