Join modifications from branch BR_DEBUG_3_2_0b1

[modules/gui.git] / src / SalomeApp / Makefile.in

diff --git a/src/SalomeApp/Makefile.in b/src/SalomeApp/Makefile.in
index fe2749c620e38d87f89e87b3c824b72677f8f310..ed377dfaf377db71f9f9d7f093b5a4c20c78372b 100755 (executable)
--- a/src/SalomeApp/Makefile.in
+++ b/src/SalomeApp/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  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.
+#
+#  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
+#
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : SalomeApp
@@ -13,33 +31,20 @@ VPATH=.:@srcdir@:@srcdir@/resources
 
 # header files 
 EXPORT_HEADERS= SalomeApp.h \
-               SalomeApp_AboutDlg.h \
                SalomeApp_Application.h \
                SalomeApp_DataModel.h \
                SalomeApp_DataObject.h \
-               SalomeApp_DataOwner.h \
-               SalomeApp_OCCSelector.h \
-               SalomeApp_VTKSelector.h \
-               SalomeApp_OBSelector.h \
-               SalomeApp_GLSelector.h \
                SalomeApp_Module.h \
                SalomeApp_Study.h \
-               SalomeApp_WidgetContainer.h \
                SalomeApp_ExceptionHandler.h \
-               SalomeApp_RootObject.h \
-               SalomeApp_SelectionMgr.h \
                SalomeApp_EventFilter.h \
-               SalomeApp_Preferences.h \
-               SalomeApp_PreferencesDlg.h \
                SalomeApp_Tools.h \
-               SalomeApp_NameDlg.h \
                SalomeApp_ImportOperation.h \
-               SalomeApp_DataSubOwner.h \
-               SalomeApp_Selection.h \
                SalomeApp_Filter.h \
                SalomeApp_TypeFilter.h \
-               SalomeApp_OBFilter.h \
-               SalomeApp_StudyPropertiesDlg.h
+               SalomeApp_StudyPropertiesDlg.h \
+               SalomeApp_CheckFileDlg.h \
+               SalomeApp_VisualState.h
 
 # .po files to transform in .qm
 PO_FILES = SalomeApp_images.po \
@@ -48,69 +53,42 @@ PO_FILES = SalomeApp_images.po \
 # Libraries targets
 LIB = libSalomeApp.la
 
-LIB_SRC= SalomeApp_AboutDlg.cxx \
+LIB_SRC= SalomeApp_Module.cxx \
          SalomeApp_Application.cxx \
         SalomeApp_DataModel.cxx \
         SalomeApp_DataObject.cxx \
-        SalomeApp_DataOwner.cxx \
-        SalomeApp_OCCSelector.cxx \
-        SalomeApp_VTKSelector.cxx \
-        SalomeApp_OBSelector.cxx \
-        SalomeApp_GLSelector.cxx \
-        SalomeApp_Module.cxx \
         SalomeApp_Study.cxx \
-        SalomeApp_WidgetContainer.cxx \
         SalomeApp_ExceptionHandler.cxx \
-        SalomeApp_SelectionMgr.cxx \
         SalomeApp_EventFilter.cxx \
-        SalomeApp_Preferences.cxx \
-        SalomeApp_PreferencesDlg.cxx \
         SalomeApp_PyInterp.cxx \
         SalomeApp_Tools.cxx \
-        SalomeApp_NameDlg.cxx \
         SalomeApp_ImportOperation.cxx \
-        SalomeApp_DataSubOwner.cxx \
-        SalomeApp_ModuleDlg.cxx \
-        SalomeApp_Selection.cxx \
         SalomeApp_Filter.cxx \
         SalomeApp_TypeFilter.cxx \
-        SalomeApp_OBFilter.cxx \
         SalomeApp_StudyPropertiesDlg.cxx \
-        SalomeApp_ListView.cxx
+        SalomeApp_ListView.cxx \
+        SalomeApp_CheckFileDlg.cxx \
+        SalomeApp_VisualState.cxx
 
-LIB_MOC = SalomeApp_AboutDlg.h \
-          SalomeApp_Application.h \
+LIB_MOC = SalomeApp_Application.h \
          SalomeApp_DataModel.h \
-         SalomeApp_OBSelector.h \
-         SalomeApp_OCCSelector.h \
-         SalomeApp_VTKSelector.h \
-         SalomeApp_GLSelector.h \
          SalomeApp_Module.h \
          SalomeApp_Study.h \
-         SalomeApp_SelectionMgr.h \
-         SalomeApp_WidgetContainer.h \
-         SalomeApp_Preferences.h \
-         SalomeApp_PreferencesDlg.h \
-         SalomeApp_NameDlg.h \
-         SalomeApp_ModuleDlg.h \
          SalomeApp_StudyPropertiesDlg.h \
-         SalomeApp_ListView.h
+         SalomeApp_ListView.h \
+         SalomeApp_CheckFileDlg.h
 
 LIB_CLIENT_IDL = SALOMEDS.idl \
                 SALOME_Exception.idl \
                 SALOME_GenericObj.idl
 
-RESOURCES_FILES = icon_about.png \
-                 icon_applogo.png \
-                  icon_default.png \
-                  icon_module.png \
-                 SalomeApp.ini \
+RESOURCES_FILES = SalomeApp.ini \
                  SalomeApp.xml
 
-CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS)
 
 LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) 
-LIBS+= -lsuit -lstd -lCAM -lObjBrowser -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace $(CAS_KERNEL) -lSPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lSalomeContainer
+LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lSalomePrs $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient $(CAS_KERNEL) -lSPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lLightApp -lSalomeContainer -lToolsGUI
 
 @CONCLUDE@