Merge from V6_main (04/10/2012)

[modules/geom.git] / src / GroupGUI / Makefile.am

diff --git a/src/GroupGUI/Makefile.am b/src/GroupGUI/Makefile.am
index 0a93e2c4dd3863e075936c36be8887109de3c01f..78e540589ff7105f5d3c606ccac23d088bf441cb 100755 (executable)
--- a/src/GroupGUI/Makefile.am
+++ b/src/GroupGUI/Makefile.am
@@ -1,29 +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
+# 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
-#
-# GEOM GROUPGUI : 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
 # File    : Makefile.am
 # Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
 # Package : GroupGUI
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
@@ -32,16 +28,20 @@ lib_LTLIBRARIES = libGroupGUI.la
 # header files 
 salomeinclude_HEADERS =                \
        GroupGUI.h              \
+       GroupGUI_BooleanDlg.h   \
        GroupGUI_GroupDlg.h
 
 dist_libGroupGUI_la_SOURCES =  \
        GroupGUI.h              \
+       GroupGUI_BooleanDlg.h   \
        GroupGUI_GroupDlg.h     \
        GroupGUI.cxx            \
+       GroupGUI_BooleanDlg.cxx \
        GroupGUI_GroupDlg.cxx
 
-MOC_FILES =                    \
-       GroupGUI_moc.cxx        \
+MOC_FILES =                            \
+       GroupGUI_moc.cxx                \
+       GroupGUI_BooleanDlg_moc.cxx     \
        GroupGUI_GroupDlg_moc.cxx 
 
 nodist_libGroupGUI_la_SOURCES =        \
@@ -67,8 +67,7 @@ libGroupGUI_la_CPPFLAGS =                     \
        -I$(srcdir)/../GEOMImpl                 \
        -I$(srcdir)/../GEOMFiltersSelection     \
        -I$(top_builddir)/src/DlgRef            \
-       -I$(top_builddir)/idl                   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGroupGUI_la_LDFLAGS         =                                       \
        ../GEOMFiltersSelection/libGEOMFiltersSelection.la      \