Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V5_1_main branch 24/11/2010
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
Makefile.am
diff --git
a/src/StdMeshersGUI/Makefile.am
b/src/StdMeshersGUI/Makefile.am
index fbc244b0f8a70f3bbe2f4ef2851f8a6c7ced2ca4..9d9875d14c5759d7a08e6c19ad7d4eea69c8313f 100644
(file)
--- a/
src/StdMeshersGUI/Makefile.am
+++ b/
src/StdMeshersGUI/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
@@
-24,7
+21,7
@@
# Author : Julia DOROVSKIKH
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : SMESH
# Author : Julia DOROVSKIKH
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : SMESH
-#
+
include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files
include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files
@@
-35,12
+32,14
@@
salomeinclude_HEADERS = \
StdMeshersGUI_DistrTable.h \
StdMeshersGUI_NbSegmentsCreator.h \
StdMeshersGUI_ObjectReferenceParamWdg.h \
StdMeshersGUI_DistrTable.h \
StdMeshersGUI_NbSegmentsCreator.h \
StdMeshersGUI_ObjectReferenceParamWdg.h \
+ StdMeshersGUI_QuadrangleParamWdg.h \
StdMeshersGUI_LayerDistributionParamWdg.h \
StdMeshersGUI_FixedPointsParamWdg.h \
StdMeshersGUI_SubShapeSelectorWdg.h
# Libraries targets
lib_LTLIBRARIES = libStdMeshersGUI.la
StdMeshersGUI_LayerDistributionParamWdg.h \
StdMeshersGUI_FixedPointsParamWdg.h \
StdMeshersGUI_SubShapeSelectorWdg.h
# Libraries targets
lib_LTLIBRARIES = libStdMeshersGUI.la
+
dist_libStdMeshersGUI_la_SOURCES = \
StdMeshersGUI.cxx \
StdMeshersGUI_StdHypothesisCreator.cxx \
dist_libStdMeshersGUI_la_SOURCES = \
StdMeshersGUI.cxx \
StdMeshersGUI_StdHypothesisCreator.cxx \
@@
-48,6
+47,7
@@
dist_libStdMeshersGUI_la_SOURCES = \
StdMeshersGUI_DistrTable.cxx \
StdMeshersGUI_NbSegmentsCreator.cxx \
StdMeshersGUI_ObjectReferenceParamWdg.cxx \
StdMeshersGUI_DistrTable.cxx \
StdMeshersGUI_NbSegmentsCreator.cxx \
StdMeshersGUI_ObjectReferenceParamWdg.cxx \
+ StdMeshersGUI_QuadrangleParamWdg.cxx \
StdMeshersGUI_LayerDistributionParamWdg.cxx \
StdMeshersGUI_FixedPointsParamWdg.cxx \
StdMeshersGUI_SubShapeSelectorWdg.cxx
StdMeshersGUI_LayerDistributionParamWdg.cxx \
StdMeshersGUI_FixedPointsParamWdg.cxx \
StdMeshersGUI_SubShapeSelectorWdg.cxx
@@
-58,6
+58,7
@@
MOC_FILES = \
StdMeshersGUI_DistrTable_moc.cxx \
StdMeshersGUI_NbSegmentsCreator_moc.cxx \
StdMeshersGUI_ObjectReferenceParamWdg_moc.cxx \
StdMeshersGUI_DistrTable_moc.cxx \
StdMeshersGUI_NbSegmentsCreator_moc.cxx \
StdMeshersGUI_ObjectReferenceParamWdg_moc.cxx \
+ StdMeshersGUI_QuadrangleParamWdg_moc.cxx \
StdMeshersGUI_LayerDistributionParamWdg_moc.cxx \
StdMeshersGUI_FixedPointsParamWdg_moc.cxx \
StdMeshersGUI_SubShapeSelectorWdg_moc.cxx
StdMeshersGUI_LayerDistributionParamWdg_moc.cxx \
StdMeshersGUI_FixedPointsParamWdg_moc.cxx \
StdMeshersGUI_SubShapeSelectorWdg_moc.cxx
@@
-102,4
+103,5
@@
libStdMeshersGUI_la_LDFLAGS = \
# resources files
nodist_salomeres_DATA= \
StdMeshers_images.qm \
# resources files
nodist_salomeres_DATA= \
StdMeshers_images.qm \
- StdMeshers_msg_en.qm
+ StdMeshers_msg_en.qm \
+ StdMeshers_msg_fr.qm