From 21ab13bcfd9f1339c9e4f520bc81895b7a8c5ae6 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 11 Sep 2008 04:25:46 +0000 Subject: [PATCH] Implement 'make dist' and 'make distcheck' steps support --- Makefile.am | 6 +- adm_local/unix/Makefile.am | 3 - adm_local/unix/make_common_starter.am | 33 ++- bin/Makefile.am | 18 +- configure.ac | 40 +-- doc/Makefile.am | 2 +- doc/salome/Makefile.am | 6 +- doc/salome/gui/Makefile.am | 26 +- doc/salome/gui/{GUI => }/doxyfile.in | 4 +- doc/salome/gui/{GUI => }/images/batchmode.png | Bin .../gui/{GUI => }/images/cataloggenerator.png | Bin .../gui/{GUI => }/images/choicepage.png | Bin doc/salome/gui/{GUI => }/images/clipping.png | Bin .../gui/{GUI => }/images/closestudy.png | Bin .../gui/{GUI => }/images/copy-paste.jpg | Bin doc/salome/gui/{GUI => }/images/dumpstudy.png | Bin doc/salome/gui/{GUI => }/images/findtool1.png | Bin doc/salome/gui/{GUI => }/images/findtool2.png | Bin .../gui/{GUI => }/images/geomview-alt.png | Bin .../gui/{GUI => }/images/graduatedaxes1.png | Bin .../gui/{GUI => }/images/icon_about.png | Bin doc/salome/gui/{GUI => }/images/image100.gif | Bin doc/salome/gui/{GUI => }/images/image102.gif | Bin doc/salome/gui/{GUI => }/images/image103.gif | Bin doc/salome/gui/{GUI => }/images/image105.gif | Bin doc/salome/gui/{GUI => }/images/image106.gif | Bin doc/salome/gui/{GUI => }/images/image108.gif | Bin doc/salome/gui/{GUI => }/images/image109.gif | Bin doc/salome/gui/{GUI => }/images/image157.gif | Bin doc/salome/gui/{GUI => }/images/image54.jpg | Bin doc/salome/gui/{GUI => }/images/image65.gif | Bin doc/salome/gui/{GUI => }/images/image67.gif | Bin doc/salome/gui/{GUI => }/images/image69.gif | Bin doc/salome/gui/{GUI => }/images/image70.gif | Bin doc/salome/gui/{GUI => }/images/image72.gif | Bin doc/salome/gui/{GUI => }/images/image73.gif | Bin doc/salome/gui/{GUI => }/images/image75.gif | Bin doc/salome/gui/{GUI => }/images/image77.gif | Bin doc/salome/gui/{GUI => }/images/image86.gif | Bin doc/salome/gui/{GUI => }/images/image88.gif | Bin doc/salome/gui/{GUI => }/images/image89.gif | Bin doc/salome/gui/{GUI => }/images/image91.gif | Bin doc/salome/gui/{GUI => }/images/image94.gif | Bin doc/salome/gui/{GUI => }/images/image95.gif | Bin doc/salome/gui/{GUI => }/images/image96.gif | Bin doc/salome/gui/{GUI => }/images/image97.gif | Bin doc/salome/gui/{GUI => }/images/image98.gif | Bin doc/salome/gui/{GUI => }/images/image99.gif | Bin doc/salome/gui/{GUI => }/images/import.png | Bin doc/salome/gui/{GUI => }/images/intropage.png | Bin .../gui/{GUI => }/images/loadscript.png | Bin .../gui/{GUI => }/images/loadstudy2.png | Bin .../gui/{GUI => }/images/lockedstudy.png | Bin doc/salome/gui/{GUI => }/images/neo-view2.png | Bin doc/salome/gui/{GUI => }/images/newsticn.jpg | Bin doc/salome/gui/{GUI => }/images/note1.gif | Bin .../gui/{GUI => }/images/objectbrowser1.png | Bin .../gui/{GUI => }/images/objectbrowser2.png | Bin .../{GUI => }/images/occviewer_axialscale.png | Bin .../{GUI => }/images/occviewer_toolbar.png | Bin doc/salome/gui/{GUI => }/images/open.jpg | Bin .../gui/{GUI => }/images/plot2d_clone.gif | Bin .../gui/{GUI => }/images/plot2d_legend.gif | Bin .../gui/{GUI => }/images/plot2d_lines.gif | Bin .../images/plot2d_logarithmic_horizontal.gif | Bin .../images/plot2d_logarithmic_vertical.gif | Bin .../gui/{GUI => }/images/plot2d_points.gif | Bin .../gui/{GUI => }/images/plot2d_settings.gif | Bin .../gui/{GUI => }/images/plot2d_splines.gif | Bin .../{GUI => }/images/plot2d_view_settings.png | Bin .../gui/{GUI => }/images/polyselection1.png | Bin .../gui/{GUI => }/images/polyselection2.png | Bin doc/salome/gui/{GUI => }/images/ppref1.png | Bin doc/salome/gui/{GUI => }/images/ppref2.png | Bin doc/salome/gui/{GUI => }/images/ppref3.png | Bin doc/salome/gui/{GUI => }/images/pref11.png | Bin doc/salome/gui/{GUI => }/images/pref12.png | Bin doc/salome/gui/{GUI => }/images/pref13.png | Bin doc/salome/gui/{GUI => }/images/pref14.png | Bin doc/salome/gui/{GUI => }/images/pref15.png | Bin doc/salome/gui/{GUI => }/images/pref21.png | Bin doc/salome/gui/{GUI => }/images/pref22.png | Bin doc/salome/gui/{GUI => }/images/pref23.png | Bin doc/salome/gui/{GUI => }/images/pref24.png | Bin doc/salome/gui/{GUI => }/images/pref31.png | Bin doc/salome/gui/{GUI => }/images/pref33.png | Bin doc/salome/gui/{GUI => }/images/pref34.png | Bin doc/salome/gui/{GUI => }/images/pref37.png | Bin doc/salome/gui/{GUI => }/images/pref38.png | Bin doc/salome/gui/{GUI => }/images/pref39.png | Bin doc/salome/gui/{GUI => }/images/pref40.png | Bin .../gui/{GUI => }/images/productpage.png | Bin .../gui/{GUI => }/images/productpage1.png | Bin .../gui/{GUI => }/images/productpage2.png | Bin .../gui/{GUI => }/images/progresspage.png | Bin .../gui/{GUI => }/images/progresspage1.png | Bin .../gui/{GUI => }/images/readmepage.png | Bin doc/salome/gui/{GUI => }/images/registry1.png | Bin doc/salome/gui/{GUI => }/images/registry3.png | Bin doc/salome/gui/{GUI => }/images/registry4.png | Bin doc/salome/gui/{GUI => }/images/save.jpg | Bin .../gui/{GUI => }/images/selectcolor.png | Bin .../gui/{GUI => }/images/selectfont.png | Bin .../images/set_rotation_point_dialog1.png | Bin .../images/set_rotation_point_dialog2.png | Bin .../gui/{GUI => }/images/studyproperties.png | Bin .../gui/{GUI => }/images/updaterate.png | Bin doc/salome/gui/{GUI => }/images/urbutton.png | Bin doc/salome/gui/{GUI => }/images/view2.png | Bin .../{GUI => }/images/view_rotation_point.png | Bin .../gui/{GUI => }/input/about_salome.doc | 0 .../{GUI => }/input/creating_new_study.doc | 0 .../{GUI => }/input/displaying_studies.doc | 0 .../gui/{GUI => }/input/editing_studies.doc | 0 .../{GUI => }/input/geometry_preferences.doc | 0 .../gui/{GUI => }/input/getting_started.doc | 0 .../{GUI => }/input/gui_module_chapter.doc | 0 doc/salome/gui/{GUI => }/input/index.doc | 0 .../gui/{GUI => }/input/installing_salome.doc | 0 .../gui/{GUI => }/input/intro_to_salome.doc | 0 .../gui/{GUI => }/input/introduction.doc | 0 .../{GUI => }/input/introduction_to_gui.doc | 0 .../gui/{GUI => }/input/mesh_preferences.doc | 0 .../gui/{GUI => }/input/occ_3d_viewer.doc | 0 .../gui/{GUI => }/input/opening_studies.doc | 0 .../gui/{GUI => }/input/plot2d_viewer.doc | 0 .../{GUI => }/input/postpro_preferences.doc | 0 .../gui/{GUI => }/input/running_salome.doc | 0 .../{GUI => }/input/salome_architecture.doc | 0 .../gui/{GUI => }/input/salome_desktop.doc | 0 .../{GUI => }/input/salome_preferences.doc | 0 .../input/saving_and_closing_studies.doc | 0 .../{GUI => }/input/select_color_and_font.doc | 0 .../{GUI => }/input/setting_preferences.doc | 0 .../input/setting_preferences_chapter.doc | 0 .../input/setting_study_properties.doc | 0 .../input/study_management_chapter.doc | 0 .../input/using_catalog_generator.doc | 0 .../gui/{GUI => }/input/using_find_tool.doc | 0 .../{GUI => }/input/using_object_browser.doc | 0 .../{GUI => }/input/using_registry_tool.doc | 0 .../gui/{GUI => }/input/viewers_chapter.doc | 0 .../gui/{GUI => }/input/vtk_3d_viewer.doc | 0 .../input/working_with_python_scripts.doc | 0 doc/salome/gui/{GUI => }/static/footer.html | 0 doc/salome/gui/{GUI => }/static/header.html | 0 doc/salome/tui/Makefile.am | 44 +-- doc/salome/tui/{GUI => }/doxyfile.in | 31 +-- .../sources => images}/Application-About.png | Bin .../{GUI/sources => images}/application.gif | Bin .../{GUI/sources => images}/html_comments.gif | Bin .../tui/{GUI/sources => images}/logocorp.gif | Bin .../tui/{GUI/sources => static}/doxygen.css | 0 .../tui/{GUI/sources => static}/footer.html | 0 .../tui/{GUI/sources => static}/myheader.html | 0 idl/Makefile.am | 18 +- resources/Makefile.am | 8 +- src/CAF/Makefile.am | 32 +-- src/CAM/Makefile.am | 43 ++- src/CASCatch/Makefile.am | 14 +- src/DDS/Makefile.am | 4 +- src/Event/Makefile.am | 8 +- src/GLViewer/Makefile.am | 155 +++++------ src/LightApp/Makefile.am | 262 +++++++++--------- src/LogWindow/Makefile.am | 14 +- src/Makefile.am | 4 + src/OBJECT/Makefile.am | 87 +++--- src/OCCViewer/Makefile.am | 134 ++++----- src/ObjBrowser/Makefile.am | 26 +- src/Plot2d/Makefile.am | 104 +++---- src/PyConsole/Makefile.am | 16 +- src/PyInterp/Makefile.am | 12 +- src/QDS/Makefile.am | 31 +-- src/Qtx/Makefile.am | 15 +- src/QxGraph/Makefile.am | 64 ++--- src/ResExporter/Makefile.am | 11 +- src/SALOME_PY/Makefile.am | 8 +- src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am | 67 ++--- src/SALOME_PYQT/SalomePyQt/Makefile.am | 75 ++--- src/SALOME_SWIG/Makefile.am | 75 +++-- src/SOCC/Makefile.am | 34 +-- src/SPlot2d/Makefile.am | 30 +- src/STD/Makefile.am | 18 +- src/SUIT/Makefile.am | 14 +- src/SUITApp/Makefile.am | 30 +- src/SUPERVGraph/Makefile.am | 40 +-- src/SVTK/Makefile.am | 182 ++++++------ src/SalomeApp/Makefile.am | 138 +++++---- src/SalomeApp/Test/Makefile.am | 18 +- src/Session/Makefile.am | 60 ++-- src/Style/Makefile.am | 26 +- src/TOOLSGUI/Makefile.am | 30 +- src/VTKViewer/Makefile.am | 134 ++++----- 193 files changed, 1089 insertions(+), 1165 deletions(-) rename doc/salome/gui/{GUI => }/doxyfile.in (96%) rename doc/salome/gui/{GUI => }/images/batchmode.png (100%) rename doc/salome/gui/{GUI => }/images/cataloggenerator.png (100%) rename doc/salome/gui/{GUI => }/images/choicepage.png (100%) rename doc/salome/gui/{GUI => }/images/clipping.png (100%) rename doc/salome/gui/{GUI => }/images/closestudy.png (100%) rename doc/salome/gui/{GUI => }/images/copy-paste.jpg (100%) rename doc/salome/gui/{GUI => }/images/dumpstudy.png (100%) rename doc/salome/gui/{GUI => }/images/findtool1.png (100%) rename doc/salome/gui/{GUI => }/images/findtool2.png (100%) rename doc/salome/gui/{GUI => }/images/geomview-alt.png (100%) rename doc/salome/gui/{GUI => }/images/graduatedaxes1.png (100%) rename doc/salome/gui/{GUI => }/images/icon_about.png (100%) rename doc/salome/gui/{GUI => }/images/image100.gif (100%) rename doc/salome/gui/{GUI => }/images/image102.gif (100%) rename doc/salome/gui/{GUI => }/images/image103.gif (100%) rename doc/salome/gui/{GUI => }/images/image105.gif (100%) rename doc/salome/gui/{GUI => }/images/image106.gif (100%) rename doc/salome/gui/{GUI => }/images/image108.gif (100%) rename doc/salome/gui/{GUI => }/images/image109.gif (100%) rename doc/salome/gui/{GUI => }/images/image157.gif (100%) rename doc/salome/gui/{GUI => }/images/image54.jpg (100%) rename doc/salome/gui/{GUI => }/images/image65.gif (100%) rename doc/salome/gui/{GUI => }/images/image67.gif (100%) rename doc/salome/gui/{GUI => }/images/image69.gif (100%) rename doc/salome/gui/{GUI => }/images/image70.gif (100%) rename doc/salome/gui/{GUI => }/images/image72.gif (100%) rename doc/salome/gui/{GUI => }/images/image73.gif (100%) rename doc/salome/gui/{GUI => }/images/image75.gif (100%) rename doc/salome/gui/{GUI => }/images/image77.gif (100%) rename doc/salome/gui/{GUI => }/images/image86.gif (100%) rename doc/salome/gui/{GUI => }/images/image88.gif (100%) rename doc/salome/gui/{GUI => }/images/image89.gif (100%) rename doc/salome/gui/{GUI => }/images/image91.gif (100%) rename doc/salome/gui/{GUI => }/images/image94.gif (100%) rename doc/salome/gui/{GUI => }/images/image95.gif (100%) rename doc/salome/gui/{GUI => }/images/image96.gif (100%) rename doc/salome/gui/{GUI => }/images/image97.gif (100%) rename doc/salome/gui/{GUI => }/images/image98.gif (100%) rename doc/salome/gui/{GUI => }/images/image99.gif (100%) rename doc/salome/gui/{GUI => }/images/import.png (100%) rename doc/salome/gui/{GUI => }/images/intropage.png (100%) rename doc/salome/gui/{GUI => }/images/loadscript.png (100%) rename doc/salome/gui/{GUI => }/images/loadstudy2.png (100%) rename doc/salome/gui/{GUI => }/images/lockedstudy.png (100%) rename doc/salome/gui/{GUI => }/images/neo-view2.png (100%) rename doc/salome/gui/{GUI => }/images/newsticn.jpg (100%) rename doc/salome/gui/{GUI => }/images/note1.gif (100%) rename doc/salome/gui/{GUI => }/images/objectbrowser1.png (100%) rename doc/salome/gui/{GUI => }/images/objectbrowser2.png (100%) rename doc/salome/gui/{GUI => }/images/occviewer_axialscale.png (100%) rename doc/salome/gui/{GUI => }/images/occviewer_toolbar.png (100%) rename doc/salome/gui/{GUI => }/images/open.jpg (100%) rename doc/salome/gui/{GUI => }/images/plot2d_clone.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_legend.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_lines.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_logarithmic_horizontal.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_logarithmic_vertical.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_points.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_settings.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_splines.gif (100%) rename doc/salome/gui/{GUI => }/images/plot2d_view_settings.png (100%) rename doc/salome/gui/{GUI => }/images/polyselection1.png (100%) rename doc/salome/gui/{GUI => }/images/polyselection2.png (100%) rename doc/salome/gui/{GUI => }/images/ppref1.png (100%) rename doc/salome/gui/{GUI => }/images/ppref2.png (100%) rename doc/salome/gui/{GUI => }/images/ppref3.png (100%) rename doc/salome/gui/{GUI => }/images/pref11.png (100%) rename doc/salome/gui/{GUI => }/images/pref12.png (100%) rename doc/salome/gui/{GUI => }/images/pref13.png (100%) rename doc/salome/gui/{GUI => }/images/pref14.png (100%) rename doc/salome/gui/{GUI => }/images/pref15.png (100%) rename doc/salome/gui/{GUI => }/images/pref21.png (100%) rename doc/salome/gui/{GUI => }/images/pref22.png (100%) rename doc/salome/gui/{GUI => }/images/pref23.png (100%) rename doc/salome/gui/{GUI => }/images/pref24.png (100%) rename doc/salome/gui/{GUI => }/images/pref31.png (100%) rename doc/salome/gui/{GUI => }/images/pref33.png (100%) rename doc/salome/gui/{GUI => }/images/pref34.png (100%) rename doc/salome/gui/{GUI => }/images/pref37.png (100%) rename doc/salome/gui/{GUI => }/images/pref38.png (100%) rename doc/salome/gui/{GUI => }/images/pref39.png (100%) rename doc/salome/gui/{GUI => }/images/pref40.png (100%) rename doc/salome/gui/{GUI => }/images/productpage.png (100%) rename doc/salome/gui/{GUI => }/images/productpage1.png (100%) rename doc/salome/gui/{GUI => }/images/productpage2.png (100%) rename doc/salome/gui/{GUI => }/images/progresspage.png (100%) rename doc/salome/gui/{GUI => }/images/progresspage1.png (100%) rename doc/salome/gui/{GUI => }/images/readmepage.png (100%) rename doc/salome/gui/{GUI => }/images/registry1.png (100%) rename doc/salome/gui/{GUI => }/images/registry3.png (100%) rename doc/salome/gui/{GUI => }/images/registry4.png (100%) rename doc/salome/gui/{GUI => }/images/save.jpg (100%) rename doc/salome/gui/{GUI => }/images/selectcolor.png (100%) rename doc/salome/gui/{GUI => }/images/selectfont.png (100%) rename doc/salome/gui/{GUI => }/images/set_rotation_point_dialog1.png (100%) rename doc/salome/gui/{GUI => }/images/set_rotation_point_dialog2.png (100%) rename doc/salome/gui/{GUI => }/images/studyproperties.png (100%) rename doc/salome/gui/{GUI => }/images/updaterate.png (100%) rename doc/salome/gui/{GUI => }/images/urbutton.png (100%) rename doc/salome/gui/{GUI => }/images/view2.png (100%) rename doc/salome/gui/{GUI => }/images/view_rotation_point.png (100%) rename doc/salome/gui/{GUI => }/input/about_salome.doc (100%) rename doc/salome/gui/{GUI => }/input/creating_new_study.doc (100%) rename doc/salome/gui/{GUI => }/input/displaying_studies.doc (100%) rename doc/salome/gui/{GUI => }/input/editing_studies.doc (100%) rename doc/salome/gui/{GUI => }/input/geometry_preferences.doc (100%) rename doc/salome/gui/{GUI => }/input/getting_started.doc (100%) rename doc/salome/gui/{GUI => }/input/gui_module_chapter.doc (100%) rename doc/salome/gui/{GUI => }/input/index.doc (100%) rename doc/salome/gui/{GUI => }/input/installing_salome.doc (100%) rename doc/salome/gui/{GUI => }/input/intro_to_salome.doc (100%) rename doc/salome/gui/{GUI => }/input/introduction.doc (100%) rename doc/salome/gui/{GUI => }/input/introduction_to_gui.doc (100%) rename doc/salome/gui/{GUI => }/input/mesh_preferences.doc (100%) rename doc/salome/gui/{GUI => }/input/occ_3d_viewer.doc (100%) rename doc/salome/gui/{GUI => }/input/opening_studies.doc (100%) rename doc/salome/gui/{GUI => }/input/plot2d_viewer.doc (100%) rename doc/salome/gui/{GUI => }/input/postpro_preferences.doc (100%) rename doc/salome/gui/{GUI => }/input/running_salome.doc (100%) rename doc/salome/gui/{GUI => }/input/salome_architecture.doc (100%) rename doc/salome/gui/{GUI => }/input/salome_desktop.doc (100%) rename doc/salome/gui/{GUI => }/input/salome_preferences.doc (100%) rename doc/salome/gui/{GUI => }/input/saving_and_closing_studies.doc (100%) rename doc/salome/gui/{GUI => }/input/select_color_and_font.doc (100%) rename doc/salome/gui/{GUI => }/input/setting_preferences.doc (100%) rename doc/salome/gui/{GUI => }/input/setting_preferences_chapter.doc (100%) rename doc/salome/gui/{GUI => }/input/setting_study_properties.doc (100%) rename doc/salome/gui/{GUI => }/input/study_management_chapter.doc (100%) rename doc/salome/gui/{GUI => }/input/using_catalog_generator.doc (100%) rename doc/salome/gui/{GUI => }/input/using_find_tool.doc (100%) rename doc/salome/gui/{GUI => }/input/using_object_browser.doc (100%) rename doc/salome/gui/{GUI => }/input/using_registry_tool.doc (100%) rename doc/salome/gui/{GUI => }/input/viewers_chapter.doc (100%) rename doc/salome/gui/{GUI => }/input/vtk_3d_viewer.doc (100%) rename doc/salome/gui/{GUI => }/input/working_with_python_scripts.doc (100%) rename doc/salome/gui/{GUI => }/static/footer.html (100%) rename doc/salome/gui/{GUI => }/static/header.html (100%) rename doc/salome/tui/{GUI => }/doxyfile.in (92%) rename doc/salome/tui/{GUI/sources => images}/Application-About.png (100%) rename doc/salome/tui/{GUI/sources => images}/application.gif (100%) rename doc/salome/tui/{GUI/sources => images}/html_comments.gif (100%) rename doc/salome/tui/{GUI/sources => images}/logocorp.gif (100%) rename doc/salome/tui/{GUI/sources => static}/doxygen.css (100%) rename doc/salome/tui/{GUI/sources => static}/footer.html (100%) rename doc/salome/tui/{GUI/sources => static}/myheader.html (100%) diff --git a/Makefile.am b/Makefile.am index 62e21b1b5..40130e280 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,9 +37,9 @@ DIST_SUBDIRS = idl adm_local resources src doc bin DISTCLEANFILES = a.out aclocal.m4 configure -salomeinclude_DATA=GUI_version.h +salomeinclude_DATA = GUI_version.h -EXTRA_DIST+= \ +EXTRA_DIST += \ build_configure \ clean_configure \ LICENCE @@ -50,7 +50,7 @@ dist-hook: usr_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) -docs:usr_docs +docs: usr_docs dev_docs: (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index f9243d2f5..facd4e6f4 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -20,6 +20,3 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files - -# this is for LIGHT module compatibility -dist_admlocalunix_DATA=make_conclude.in \ No newline at end of file diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index ecead78c2..0236bfbbd 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -7,47 +7,52 @@ # # Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -bindir = $(prefix)/bin/@PACKAGE@ +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) +salomepythondir = $(pythondir)/salome +salomepyexecdir = $(pyexecdir)/salome # Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ +salomeidldir = $(prefix)/idl/salome # Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ # Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files # Shared modules installation directory -sharedpkgpythondir =$(pkgpythondir)/shared_modules +sharedpkgpythondir = $(salomepythondir)/shared_modules # Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/salome # common rules -# moc-files generation +# meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ -# qm-files generation +# translation (*.qm) files generation (lrelease) %.qm: resources/%.ts $(LRELEASE) $< -qm $@ -# resource files generation +# resource files generation (qrcc) qrc_%.cxx: %.qrc $(QRCC) $< -o $@ -name $(*F) -EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cpp=%.qrc) $(nodist_salomeres_DATA:%.qm=resources/%.ts) +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) $(nodist_salomeres_DATA:%.qm=resources/%.ts) +# customize clean operation mostlyclean-local: rm -f @builddir@/*_moc.cxx rm -f @builddir@/*.qm + rm -f @builddir@/qrc_*.cxx # tests tests: unittest diff --git a/bin/Makefile.am b/bin/Makefile.am index a0f5c8488..03d050606 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -24,18 +24,10 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# These files are data, module or lib files -nodist_salomescript_DATA= VERSION - -EXTRA_DIST+= VERSION.in +# non-distributed files +nodist_salomescript_DATA = VERSION -# These files are executable scripts -dist_salomescript_SCRIPTS=\ - runLightSalome.csh \ +# distributed files +dist_salomescript_SCRIPTS = \ + runLightSalome.csh \ runLightSalome.sh diff --git a/configure.ac b/configure.ac index 383c0114a..905df6561 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # Modified by : Mikhail PONIKAROV (OCN) - autotools usage # -AC_INIT([Salome2 Project GUI module], [5.0.0], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project GUI module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeGUI]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -557,42 +557,16 @@ AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) AM_CONDITIONAL(ENABLE_QXGRAPHVIEWER, [test "$DISABLE_QXGRAPHVIEWER" = no]) -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome - -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS | ./bin/salome) ;; - *) $INSTALL $i . ; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - echo echo --------------------------------------------- echo generating Makefiles and configure files echo --------------------------------------------- echo -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/*; \ - chmod +x ./bin/salome/*; \ -]) +#AC_OUTPUT_COMMANDS([ \ +# chmod +x ./bin/*; \ +# chmod +x ./bin/salome/*; \ +#]) # This list is initiated using autoscan and must be updated manually # when adding a new file .in to manage. When you execute @@ -609,9 +583,9 @@ AC_OUTPUT([ \ ./doc/Makefile \ ./doc/salome/Makefile \ ./doc/salome/gui/Makefile \ - ./doc/salome/gui/GUI/doxyfile \ + ./doc/salome/gui/doxyfile \ ./doc/salome/tui/Makefile \ - ./doc/salome/tui/GUI/doxyfile \ + ./doc/salome/tui/doxyfile \ ./src/Makefile \ ./src/CASCatch/Makefile \ ./src/Qtx/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 6a2c2428b..687e7ebca 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -24,4 +24,4 @@ # $Header$ # -SUBDIRS= salome +SUBDIRS = salome diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 29f7e1854..be64a4fea 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -24,9 +24,9 @@ # $Header$ # -SUBDIRS= tui gui -SUBDIRSTUI= tui -SUBDIRSGUI= gui +SUBDIRS = tui gui +SUBDIRSTUI = tui +SUBDIRSGUI = gui usr_docs: @@SETX@; for d in $(SUBDIRSGUI); do \ diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index d3e5b808f..d7af66fc3 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -22,32 +22,20 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST+=GUI +EXTRA_DIST += images input static -doxygen=@DOXYGEN@ - -usr_docs: - cd ./GUI; \ +usr_docs: doxyfile echo "Running doxygen in directory: "`pwd`; \ - $(doxygen) ./doxyfile; + $(DOXYGEN) $< docs: usr_docs clean-local: - cd ./GUI; \ - rm -fr `ls | grep -v "doxyfile"` - rm -fr `ls | grep -vE "Makefile|GUI"` + -rm -fr GUI doxygen.bak install-data-local: usr_docs - mkdir -p $(docdir)/gui - cp -rf GUI $(docdir)/gui - -find $(PWD) -name CVS -prune -exec rm -rf {} \; + $(INSTALL) -d $(DESTDIR)$(docdir)/gui + cp -rp GUI $(DESTDIR)$(docdir)/gui uninstall-local: - rm -rf $(docdir)/gui/GUI - -docguidir=$(docdir)/gui/GUI - -nodist_docgui_DATA= GUI/doxyfile -GUI/doxyfile: GUI/doxyfile.in -EXTRA_DIST+= GUI/doxyfile.in + rm -rf $(DESTDIR)$(docdir)/gui diff --git a/doc/salome/gui/GUI/doxyfile.in b/doc/salome/gui/doxyfile.in similarity index 96% rename from doc/salome/gui/GUI/doxyfile.in rename to doc/salome/gui/doxyfile.in index dfb7f3614..c746a6df2 100755 --- a/doc/salome/gui/GUI/doxyfile.in +++ b/doc/salome/gui/doxyfile.in @@ -2,7 +2,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "GUI Module Reference Manual v.@VERSION@" -OUTPUT_DIRECTORY = ./ +OUTPUT_DIRECTORY = GUI CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English TAB_SIZE = 5 @@ -24,7 +24,7 @@ IMAGE_PATH = @srcdir@/images #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = ./ +HTML_OUTPUT = . HTML_HEADER = @srcdir@/static/header.html HTML_FOOTER = @srcdir@/static/footer.html #HTML_STYLESHEET = @srcdir@/static/doxygen.css diff --git a/doc/salome/gui/GUI/images/batchmode.png b/doc/salome/gui/images/batchmode.png similarity index 100% rename from doc/salome/gui/GUI/images/batchmode.png rename to doc/salome/gui/images/batchmode.png diff --git a/doc/salome/gui/GUI/images/cataloggenerator.png b/doc/salome/gui/images/cataloggenerator.png similarity index 100% rename from doc/salome/gui/GUI/images/cataloggenerator.png rename to doc/salome/gui/images/cataloggenerator.png diff --git a/doc/salome/gui/GUI/images/choicepage.png b/doc/salome/gui/images/choicepage.png similarity index 100% rename from doc/salome/gui/GUI/images/choicepage.png rename to doc/salome/gui/images/choicepage.png diff --git a/doc/salome/gui/GUI/images/clipping.png b/doc/salome/gui/images/clipping.png similarity index 100% rename from doc/salome/gui/GUI/images/clipping.png rename to doc/salome/gui/images/clipping.png diff --git a/doc/salome/gui/GUI/images/closestudy.png b/doc/salome/gui/images/closestudy.png similarity index 100% rename from doc/salome/gui/GUI/images/closestudy.png rename to doc/salome/gui/images/closestudy.png diff --git a/doc/salome/gui/GUI/images/copy-paste.jpg b/doc/salome/gui/images/copy-paste.jpg similarity index 100% rename from doc/salome/gui/GUI/images/copy-paste.jpg rename to doc/salome/gui/images/copy-paste.jpg diff --git a/doc/salome/gui/GUI/images/dumpstudy.png b/doc/salome/gui/images/dumpstudy.png similarity index 100% rename from doc/salome/gui/GUI/images/dumpstudy.png rename to doc/salome/gui/images/dumpstudy.png diff --git a/doc/salome/gui/GUI/images/findtool1.png b/doc/salome/gui/images/findtool1.png similarity index 100% rename from doc/salome/gui/GUI/images/findtool1.png rename to doc/salome/gui/images/findtool1.png diff --git a/doc/salome/gui/GUI/images/findtool2.png b/doc/salome/gui/images/findtool2.png similarity index 100% rename from doc/salome/gui/GUI/images/findtool2.png rename to doc/salome/gui/images/findtool2.png diff --git a/doc/salome/gui/GUI/images/geomview-alt.png b/doc/salome/gui/images/geomview-alt.png similarity index 100% rename from doc/salome/gui/GUI/images/geomview-alt.png rename to doc/salome/gui/images/geomview-alt.png diff --git a/doc/salome/gui/GUI/images/graduatedaxes1.png b/doc/salome/gui/images/graduatedaxes1.png similarity index 100% rename from doc/salome/gui/GUI/images/graduatedaxes1.png rename to doc/salome/gui/images/graduatedaxes1.png diff --git a/doc/salome/gui/GUI/images/icon_about.png b/doc/salome/gui/images/icon_about.png similarity index 100% rename from doc/salome/gui/GUI/images/icon_about.png rename to doc/salome/gui/images/icon_about.png diff --git a/doc/salome/gui/GUI/images/image100.gif b/doc/salome/gui/images/image100.gif similarity index 100% rename from doc/salome/gui/GUI/images/image100.gif rename to doc/salome/gui/images/image100.gif diff --git a/doc/salome/gui/GUI/images/image102.gif b/doc/salome/gui/images/image102.gif similarity index 100% rename from doc/salome/gui/GUI/images/image102.gif rename to doc/salome/gui/images/image102.gif diff --git a/doc/salome/gui/GUI/images/image103.gif b/doc/salome/gui/images/image103.gif similarity index 100% rename from doc/salome/gui/GUI/images/image103.gif rename to doc/salome/gui/images/image103.gif diff --git a/doc/salome/gui/GUI/images/image105.gif b/doc/salome/gui/images/image105.gif similarity index 100% rename from doc/salome/gui/GUI/images/image105.gif rename to doc/salome/gui/images/image105.gif diff --git a/doc/salome/gui/GUI/images/image106.gif b/doc/salome/gui/images/image106.gif similarity index 100% rename from doc/salome/gui/GUI/images/image106.gif rename to doc/salome/gui/images/image106.gif diff --git a/doc/salome/gui/GUI/images/image108.gif b/doc/salome/gui/images/image108.gif similarity index 100% rename from doc/salome/gui/GUI/images/image108.gif rename to doc/salome/gui/images/image108.gif diff --git a/doc/salome/gui/GUI/images/image109.gif b/doc/salome/gui/images/image109.gif similarity index 100% rename from doc/salome/gui/GUI/images/image109.gif rename to doc/salome/gui/images/image109.gif diff --git a/doc/salome/gui/GUI/images/image157.gif b/doc/salome/gui/images/image157.gif similarity index 100% rename from doc/salome/gui/GUI/images/image157.gif rename to doc/salome/gui/images/image157.gif diff --git a/doc/salome/gui/GUI/images/image54.jpg b/doc/salome/gui/images/image54.jpg similarity index 100% rename from doc/salome/gui/GUI/images/image54.jpg rename to doc/salome/gui/images/image54.jpg diff --git a/doc/salome/gui/GUI/images/image65.gif b/doc/salome/gui/images/image65.gif similarity index 100% rename from doc/salome/gui/GUI/images/image65.gif rename to doc/salome/gui/images/image65.gif diff --git a/doc/salome/gui/GUI/images/image67.gif b/doc/salome/gui/images/image67.gif similarity index 100% rename from doc/salome/gui/GUI/images/image67.gif rename to doc/salome/gui/images/image67.gif diff --git a/doc/salome/gui/GUI/images/image69.gif b/doc/salome/gui/images/image69.gif similarity index 100% rename from doc/salome/gui/GUI/images/image69.gif rename to doc/salome/gui/images/image69.gif diff --git a/doc/salome/gui/GUI/images/image70.gif b/doc/salome/gui/images/image70.gif similarity index 100% rename from doc/salome/gui/GUI/images/image70.gif rename to doc/salome/gui/images/image70.gif diff --git a/doc/salome/gui/GUI/images/image72.gif b/doc/salome/gui/images/image72.gif similarity index 100% rename from doc/salome/gui/GUI/images/image72.gif rename to doc/salome/gui/images/image72.gif diff --git a/doc/salome/gui/GUI/images/image73.gif b/doc/salome/gui/images/image73.gif similarity index 100% rename from doc/salome/gui/GUI/images/image73.gif rename to doc/salome/gui/images/image73.gif diff --git a/doc/salome/gui/GUI/images/image75.gif b/doc/salome/gui/images/image75.gif similarity index 100% rename from doc/salome/gui/GUI/images/image75.gif rename to doc/salome/gui/images/image75.gif diff --git a/doc/salome/gui/GUI/images/image77.gif b/doc/salome/gui/images/image77.gif similarity index 100% rename from doc/salome/gui/GUI/images/image77.gif rename to doc/salome/gui/images/image77.gif diff --git a/doc/salome/gui/GUI/images/image86.gif b/doc/salome/gui/images/image86.gif similarity index 100% rename from doc/salome/gui/GUI/images/image86.gif rename to doc/salome/gui/images/image86.gif diff --git a/doc/salome/gui/GUI/images/image88.gif b/doc/salome/gui/images/image88.gif similarity index 100% rename from doc/salome/gui/GUI/images/image88.gif rename to doc/salome/gui/images/image88.gif diff --git a/doc/salome/gui/GUI/images/image89.gif b/doc/salome/gui/images/image89.gif similarity index 100% rename from doc/salome/gui/GUI/images/image89.gif rename to doc/salome/gui/images/image89.gif diff --git a/doc/salome/gui/GUI/images/image91.gif b/doc/salome/gui/images/image91.gif similarity index 100% rename from doc/salome/gui/GUI/images/image91.gif rename to doc/salome/gui/images/image91.gif diff --git a/doc/salome/gui/GUI/images/image94.gif b/doc/salome/gui/images/image94.gif similarity index 100% rename from doc/salome/gui/GUI/images/image94.gif rename to doc/salome/gui/images/image94.gif diff --git a/doc/salome/gui/GUI/images/image95.gif b/doc/salome/gui/images/image95.gif similarity index 100% rename from doc/salome/gui/GUI/images/image95.gif rename to doc/salome/gui/images/image95.gif diff --git a/doc/salome/gui/GUI/images/image96.gif b/doc/salome/gui/images/image96.gif similarity index 100% rename from doc/salome/gui/GUI/images/image96.gif rename to doc/salome/gui/images/image96.gif diff --git a/doc/salome/gui/GUI/images/image97.gif b/doc/salome/gui/images/image97.gif similarity index 100% rename from doc/salome/gui/GUI/images/image97.gif rename to doc/salome/gui/images/image97.gif diff --git a/doc/salome/gui/GUI/images/image98.gif b/doc/salome/gui/images/image98.gif similarity index 100% rename from doc/salome/gui/GUI/images/image98.gif rename to doc/salome/gui/images/image98.gif diff --git a/doc/salome/gui/GUI/images/image99.gif b/doc/salome/gui/images/image99.gif similarity index 100% rename from doc/salome/gui/GUI/images/image99.gif rename to doc/salome/gui/images/image99.gif diff --git a/doc/salome/gui/GUI/images/import.png b/doc/salome/gui/images/import.png similarity index 100% rename from doc/salome/gui/GUI/images/import.png rename to doc/salome/gui/images/import.png diff --git a/doc/salome/gui/GUI/images/intropage.png b/doc/salome/gui/images/intropage.png similarity index 100% rename from doc/salome/gui/GUI/images/intropage.png rename to doc/salome/gui/images/intropage.png diff --git a/doc/salome/gui/GUI/images/loadscript.png b/doc/salome/gui/images/loadscript.png similarity index 100% rename from doc/salome/gui/GUI/images/loadscript.png rename to doc/salome/gui/images/loadscript.png diff --git a/doc/salome/gui/GUI/images/loadstudy2.png b/doc/salome/gui/images/loadstudy2.png similarity index 100% rename from doc/salome/gui/GUI/images/loadstudy2.png rename to doc/salome/gui/images/loadstudy2.png diff --git a/doc/salome/gui/GUI/images/lockedstudy.png b/doc/salome/gui/images/lockedstudy.png similarity index 100% rename from doc/salome/gui/GUI/images/lockedstudy.png rename to doc/salome/gui/images/lockedstudy.png diff --git a/doc/salome/gui/GUI/images/neo-view2.png b/doc/salome/gui/images/neo-view2.png similarity index 100% rename from doc/salome/gui/GUI/images/neo-view2.png rename to doc/salome/gui/images/neo-view2.png diff --git a/doc/salome/gui/GUI/images/newsticn.jpg b/doc/salome/gui/images/newsticn.jpg similarity index 100% rename from doc/salome/gui/GUI/images/newsticn.jpg rename to doc/salome/gui/images/newsticn.jpg diff --git a/doc/salome/gui/GUI/images/note1.gif b/doc/salome/gui/images/note1.gif similarity index 100% rename from doc/salome/gui/GUI/images/note1.gif rename to doc/salome/gui/images/note1.gif diff --git a/doc/salome/gui/GUI/images/objectbrowser1.png b/doc/salome/gui/images/objectbrowser1.png similarity index 100% rename from doc/salome/gui/GUI/images/objectbrowser1.png rename to doc/salome/gui/images/objectbrowser1.png diff --git a/doc/salome/gui/GUI/images/objectbrowser2.png b/doc/salome/gui/images/objectbrowser2.png similarity index 100% rename from doc/salome/gui/GUI/images/objectbrowser2.png rename to doc/salome/gui/images/objectbrowser2.png diff --git a/doc/salome/gui/GUI/images/occviewer_axialscale.png b/doc/salome/gui/images/occviewer_axialscale.png similarity index 100% rename from doc/salome/gui/GUI/images/occviewer_axialscale.png rename to doc/salome/gui/images/occviewer_axialscale.png diff --git a/doc/salome/gui/GUI/images/occviewer_toolbar.png b/doc/salome/gui/images/occviewer_toolbar.png similarity index 100% rename from doc/salome/gui/GUI/images/occviewer_toolbar.png rename to doc/salome/gui/images/occviewer_toolbar.png diff --git a/doc/salome/gui/GUI/images/open.jpg b/doc/salome/gui/images/open.jpg similarity index 100% rename from doc/salome/gui/GUI/images/open.jpg rename to doc/salome/gui/images/open.jpg diff --git a/doc/salome/gui/GUI/images/plot2d_clone.gif b/doc/salome/gui/images/plot2d_clone.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_clone.gif rename to doc/salome/gui/images/plot2d_clone.gif diff --git a/doc/salome/gui/GUI/images/plot2d_legend.gif b/doc/salome/gui/images/plot2d_legend.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_legend.gif rename to doc/salome/gui/images/plot2d_legend.gif diff --git a/doc/salome/gui/GUI/images/plot2d_lines.gif b/doc/salome/gui/images/plot2d_lines.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_lines.gif rename to doc/salome/gui/images/plot2d_lines.gif diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif b/doc/salome/gui/images/plot2d_logarithmic_horizontal.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif rename to doc/salome/gui/images/plot2d_logarithmic_horizontal.gif diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif b/doc/salome/gui/images/plot2d_logarithmic_vertical.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif rename to doc/salome/gui/images/plot2d_logarithmic_vertical.gif diff --git a/doc/salome/gui/GUI/images/plot2d_points.gif b/doc/salome/gui/images/plot2d_points.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_points.gif rename to doc/salome/gui/images/plot2d_points.gif diff --git a/doc/salome/gui/GUI/images/plot2d_settings.gif b/doc/salome/gui/images/plot2d_settings.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_settings.gif rename to doc/salome/gui/images/plot2d_settings.gif diff --git a/doc/salome/gui/GUI/images/plot2d_splines.gif b/doc/salome/gui/images/plot2d_splines.gif similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_splines.gif rename to doc/salome/gui/images/plot2d_splines.gif diff --git a/doc/salome/gui/GUI/images/plot2d_view_settings.png b/doc/salome/gui/images/plot2d_view_settings.png similarity index 100% rename from doc/salome/gui/GUI/images/plot2d_view_settings.png rename to doc/salome/gui/images/plot2d_view_settings.png diff --git a/doc/salome/gui/GUI/images/polyselection1.png b/doc/salome/gui/images/polyselection1.png similarity index 100% rename from doc/salome/gui/GUI/images/polyselection1.png rename to doc/salome/gui/images/polyselection1.png diff --git a/doc/salome/gui/GUI/images/polyselection2.png b/doc/salome/gui/images/polyselection2.png similarity index 100% rename from doc/salome/gui/GUI/images/polyselection2.png rename to doc/salome/gui/images/polyselection2.png diff --git a/doc/salome/gui/GUI/images/ppref1.png b/doc/salome/gui/images/ppref1.png similarity index 100% rename from doc/salome/gui/GUI/images/ppref1.png rename to doc/salome/gui/images/ppref1.png diff --git a/doc/salome/gui/GUI/images/ppref2.png b/doc/salome/gui/images/ppref2.png similarity index 100% rename from doc/salome/gui/GUI/images/ppref2.png rename to doc/salome/gui/images/ppref2.png diff --git a/doc/salome/gui/GUI/images/ppref3.png b/doc/salome/gui/images/ppref3.png similarity index 100% rename from doc/salome/gui/GUI/images/ppref3.png rename to doc/salome/gui/images/ppref3.png diff --git a/doc/salome/gui/GUI/images/pref11.png b/doc/salome/gui/images/pref11.png similarity index 100% rename from doc/salome/gui/GUI/images/pref11.png rename to doc/salome/gui/images/pref11.png diff --git a/doc/salome/gui/GUI/images/pref12.png b/doc/salome/gui/images/pref12.png similarity index 100% rename from doc/salome/gui/GUI/images/pref12.png rename to doc/salome/gui/images/pref12.png diff --git a/doc/salome/gui/GUI/images/pref13.png b/doc/salome/gui/images/pref13.png similarity index 100% rename from doc/salome/gui/GUI/images/pref13.png rename to doc/salome/gui/images/pref13.png diff --git a/doc/salome/gui/GUI/images/pref14.png b/doc/salome/gui/images/pref14.png similarity index 100% rename from doc/salome/gui/GUI/images/pref14.png rename to doc/salome/gui/images/pref14.png diff --git a/doc/salome/gui/GUI/images/pref15.png b/doc/salome/gui/images/pref15.png similarity index 100% rename from doc/salome/gui/GUI/images/pref15.png rename to doc/salome/gui/images/pref15.png diff --git a/doc/salome/gui/GUI/images/pref21.png b/doc/salome/gui/images/pref21.png similarity index 100% rename from doc/salome/gui/GUI/images/pref21.png rename to doc/salome/gui/images/pref21.png diff --git a/doc/salome/gui/GUI/images/pref22.png b/doc/salome/gui/images/pref22.png similarity index 100% rename from doc/salome/gui/GUI/images/pref22.png rename to doc/salome/gui/images/pref22.png diff --git a/doc/salome/gui/GUI/images/pref23.png b/doc/salome/gui/images/pref23.png similarity index 100% rename from doc/salome/gui/GUI/images/pref23.png rename to doc/salome/gui/images/pref23.png diff --git a/doc/salome/gui/GUI/images/pref24.png b/doc/salome/gui/images/pref24.png similarity index 100% rename from doc/salome/gui/GUI/images/pref24.png rename to doc/salome/gui/images/pref24.png diff --git a/doc/salome/gui/GUI/images/pref31.png b/doc/salome/gui/images/pref31.png similarity index 100% rename from doc/salome/gui/GUI/images/pref31.png rename to doc/salome/gui/images/pref31.png diff --git a/doc/salome/gui/GUI/images/pref33.png b/doc/salome/gui/images/pref33.png similarity index 100% rename from doc/salome/gui/GUI/images/pref33.png rename to doc/salome/gui/images/pref33.png diff --git a/doc/salome/gui/GUI/images/pref34.png b/doc/salome/gui/images/pref34.png similarity index 100% rename from doc/salome/gui/GUI/images/pref34.png rename to doc/salome/gui/images/pref34.png diff --git a/doc/salome/gui/GUI/images/pref37.png b/doc/salome/gui/images/pref37.png similarity index 100% rename from doc/salome/gui/GUI/images/pref37.png rename to doc/salome/gui/images/pref37.png diff --git a/doc/salome/gui/GUI/images/pref38.png b/doc/salome/gui/images/pref38.png similarity index 100% rename from doc/salome/gui/GUI/images/pref38.png rename to doc/salome/gui/images/pref38.png diff --git a/doc/salome/gui/GUI/images/pref39.png b/doc/salome/gui/images/pref39.png similarity index 100% rename from doc/salome/gui/GUI/images/pref39.png rename to doc/salome/gui/images/pref39.png diff --git a/doc/salome/gui/GUI/images/pref40.png b/doc/salome/gui/images/pref40.png similarity index 100% rename from doc/salome/gui/GUI/images/pref40.png rename to doc/salome/gui/images/pref40.png diff --git a/doc/salome/gui/GUI/images/productpage.png b/doc/salome/gui/images/productpage.png similarity index 100% rename from doc/salome/gui/GUI/images/productpage.png rename to doc/salome/gui/images/productpage.png diff --git a/doc/salome/gui/GUI/images/productpage1.png b/doc/salome/gui/images/productpage1.png similarity index 100% rename from doc/salome/gui/GUI/images/productpage1.png rename to doc/salome/gui/images/productpage1.png diff --git a/doc/salome/gui/GUI/images/productpage2.png b/doc/salome/gui/images/productpage2.png similarity index 100% rename from doc/salome/gui/GUI/images/productpage2.png rename to doc/salome/gui/images/productpage2.png diff --git a/doc/salome/gui/GUI/images/progresspage.png b/doc/salome/gui/images/progresspage.png similarity index 100% rename from doc/salome/gui/GUI/images/progresspage.png rename to doc/salome/gui/images/progresspage.png diff --git a/doc/salome/gui/GUI/images/progresspage1.png b/doc/salome/gui/images/progresspage1.png similarity index 100% rename from doc/salome/gui/GUI/images/progresspage1.png rename to doc/salome/gui/images/progresspage1.png diff --git a/doc/salome/gui/GUI/images/readmepage.png b/doc/salome/gui/images/readmepage.png similarity index 100% rename from doc/salome/gui/GUI/images/readmepage.png rename to doc/salome/gui/images/readmepage.png diff --git a/doc/salome/gui/GUI/images/registry1.png b/doc/salome/gui/images/registry1.png similarity index 100% rename from doc/salome/gui/GUI/images/registry1.png rename to doc/salome/gui/images/registry1.png diff --git a/doc/salome/gui/GUI/images/registry3.png b/doc/salome/gui/images/registry3.png similarity index 100% rename from doc/salome/gui/GUI/images/registry3.png rename to doc/salome/gui/images/registry3.png diff --git a/doc/salome/gui/GUI/images/registry4.png b/doc/salome/gui/images/registry4.png similarity index 100% rename from doc/salome/gui/GUI/images/registry4.png rename to doc/salome/gui/images/registry4.png diff --git a/doc/salome/gui/GUI/images/save.jpg b/doc/salome/gui/images/save.jpg similarity index 100% rename from doc/salome/gui/GUI/images/save.jpg rename to doc/salome/gui/images/save.jpg diff --git a/doc/salome/gui/GUI/images/selectcolor.png b/doc/salome/gui/images/selectcolor.png similarity index 100% rename from doc/salome/gui/GUI/images/selectcolor.png rename to doc/salome/gui/images/selectcolor.png diff --git a/doc/salome/gui/GUI/images/selectfont.png b/doc/salome/gui/images/selectfont.png similarity index 100% rename from doc/salome/gui/GUI/images/selectfont.png rename to doc/salome/gui/images/selectfont.png diff --git a/doc/salome/gui/GUI/images/set_rotation_point_dialog1.png b/doc/salome/gui/images/set_rotation_point_dialog1.png similarity index 100% rename from doc/salome/gui/GUI/images/set_rotation_point_dialog1.png rename to doc/salome/gui/images/set_rotation_point_dialog1.png diff --git a/doc/salome/gui/GUI/images/set_rotation_point_dialog2.png b/doc/salome/gui/images/set_rotation_point_dialog2.png similarity index 100% rename from doc/salome/gui/GUI/images/set_rotation_point_dialog2.png rename to doc/salome/gui/images/set_rotation_point_dialog2.png diff --git a/doc/salome/gui/GUI/images/studyproperties.png b/doc/salome/gui/images/studyproperties.png similarity index 100% rename from doc/salome/gui/GUI/images/studyproperties.png rename to doc/salome/gui/images/studyproperties.png diff --git a/doc/salome/gui/GUI/images/updaterate.png b/doc/salome/gui/images/updaterate.png similarity index 100% rename from doc/salome/gui/GUI/images/updaterate.png rename to doc/salome/gui/images/updaterate.png diff --git a/doc/salome/gui/GUI/images/urbutton.png b/doc/salome/gui/images/urbutton.png similarity index 100% rename from doc/salome/gui/GUI/images/urbutton.png rename to doc/salome/gui/images/urbutton.png diff --git a/doc/salome/gui/GUI/images/view2.png b/doc/salome/gui/images/view2.png similarity index 100% rename from doc/salome/gui/GUI/images/view2.png rename to doc/salome/gui/images/view2.png diff --git a/doc/salome/gui/GUI/images/view_rotation_point.png b/doc/salome/gui/images/view_rotation_point.png similarity index 100% rename from doc/salome/gui/GUI/images/view_rotation_point.png rename to doc/salome/gui/images/view_rotation_point.png diff --git a/doc/salome/gui/GUI/input/about_salome.doc b/doc/salome/gui/input/about_salome.doc similarity index 100% rename from doc/salome/gui/GUI/input/about_salome.doc rename to doc/salome/gui/input/about_salome.doc diff --git a/doc/salome/gui/GUI/input/creating_new_study.doc b/doc/salome/gui/input/creating_new_study.doc similarity index 100% rename from doc/salome/gui/GUI/input/creating_new_study.doc rename to doc/salome/gui/input/creating_new_study.doc diff --git a/doc/salome/gui/GUI/input/displaying_studies.doc b/doc/salome/gui/input/displaying_studies.doc similarity index 100% rename from doc/salome/gui/GUI/input/displaying_studies.doc rename to doc/salome/gui/input/displaying_studies.doc diff --git a/doc/salome/gui/GUI/input/editing_studies.doc b/doc/salome/gui/input/editing_studies.doc similarity index 100% rename from doc/salome/gui/GUI/input/editing_studies.doc rename to doc/salome/gui/input/editing_studies.doc diff --git a/doc/salome/gui/GUI/input/geometry_preferences.doc b/doc/salome/gui/input/geometry_preferences.doc similarity index 100% rename from doc/salome/gui/GUI/input/geometry_preferences.doc rename to doc/salome/gui/input/geometry_preferences.doc diff --git a/doc/salome/gui/GUI/input/getting_started.doc b/doc/salome/gui/input/getting_started.doc similarity index 100% rename from doc/salome/gui/GUI/input/getting_started.doc rename to doc/salome/gui/input/getting_started.doc diff --git a/doc/salome/gui/GUI/input/gui_module_chapter.doc b/doc/salome/gui/input/gui_module_chapter.doc similarity index 100% rename from doc/salome/gui/GUI/input/gui_module_chapter.doc rename to doc/salome/gui/input/gui_module_chapter.doc diff --git a/doc/salome/gui/GUI/input/index.doc b/doc/salome/gui/input/index.doc similarity index 100% rename from doc/salome/gui/GUI/input/index.doc rename to doc/salome/gui/input/index.doc diff --git a/doc/salome/gui/GUI/input/installing_salome.doc b/doc/salome/gui/input/installing_salome.doc similarity index 100% rename from doc/salome/gui/GUI/input/installing_salome.doc rename to doc/salome/gui/input/installing_salome.doc diff --git a/doc/salome/gui/GUI/input/intro_to_salome.doc b/doc/salome/gui/input/intro_to_salome.doc similarity index 100% rename from doc/salome/gui/GUI/input/intro_to_salome.doc rename to doc/salome/gui/input/intro_to_salome.doc diff --git a/doc/salome/gui/GUI/input/introduction.doc b/doc/salome/gui/input/introduction.doc similarity index 100% rename from doc/salome/gui/GUI/input/introduction.doc rename to doc/salome/gui/input/introduction.doc diff --git a/doc/salome/gui/GUI/input/introduction_to_gui.doc b/doc/salome/gui/input/introduction_to_gui.doc similarity index 100% rename from doc/salome/gui/GUI/input/introduction_to_gui.doc rename to doc/salome/gui/input/introduction_to_gui.doc diff --git a/doc/salome/gui/GUI/input/mesh_preferences.doc b/doc/salome/gui/input/mesh_preferences.doc similarity index 100% rename from doc/salome/gui/GUI/input/mesh_preferences.doc rename to doc/salome/gui/input/mesh_preferences.doc diff --git a/doc/salome/gui/GUI/input/occ_3d_viewer.doc b/doc/salome/gui/input/occ_3d_viewer.doc similarity index 100% rename from doc/salome/gui/GUI/input/occ_3d_viewer.doc rename to doc/salome/gui/input/occ_3d_viewer.doc diff --git a/doc/salome/gui/GUI/input/opening_studies.doc b/doc/salome/gui/input/opening_studies.doc similarity index 100% rename from doc/salome/gui/GUI/input/opening_studies.doc rename to doc/salome/gui/input/opening_studies.doc diff --git a/doc/salome/gui/GUI/input/plot2d_viewer.doc b/doc/salome/gui/input/plot2d_viewer.doc similarity index 100% rename from doc/salome/gui/GUI/input/plot2d_viewer.doc rename to doc/salome/gui/input/plot2d_viewer.doc diff --git a/doc/salome/gui/GUI/input/postpro_preferences.doc b/doc/salome/gui/input/postpro_preferences.doc similarity index 100% rename from doc/salome/gui/GUI/input/postpro_preferences.doc rename to doc/salome/gui/input/postpro_preferences.doc diff --git a/doc/salome/gui/GUI/input/running_salome.doc b/doc/salome/gui/input/running_salome.doc similarity index 100% rename from doc/salome/gui/GUI/input/running_salome.doc rename to doc/salome/gui/input/running_salome.doc diff --git a/doc/salome/gui/GUI/input/salome_architecture.doc b/doc/salome/gui/input/salome_architecture.doc similarity index 100% rename from doc/salome/gui/GUI/input/salome_architecture.doc rename to doc/salome/gui/input/salome_architecture.doc diff --git a/doc/salome/gui/GUI/input/salome_desktop.doc b/doc/salome/gui/input/salome_desktop.doc similarity index 100% rename from doc/salome/gui/GUI/input/salome_desktop.doc rename to doc/salome/gui/input/salome_desktop.doc diff --git a/doc/salome/gui/GUI/input/salome_preferences.doc b/doc/salome/gui/input/salome_preferences.doc similarity index 100% rename from doc/salome/gui/GUI/input/salome_preferences.doc rename to doc/salome/gui/input/salome_preferences.doc diff --git a/doc/salome/gui/GUI/input/saving_and_closing_studies.doc b/doc/salome/gui/input/saving_and_closing_studies.doc similarity index 100% rename from doc/salome/gui/GUI/input/saving_and_closing_studies.doc rename to doc/salome/gui/input/saving_and_closing_studies.doc diff --git a/doc/salome/gui/GUI/input/select_color_and_font.doc b/doc/salome/gui/input/select_color_and_font.doc similarity index 100% rename from doc/salome/gui/GUI/input/select_color_and_font.doc rename to doc/salome/gui/input/select_color_and_font.doc diff --git a/doc/salome/gui/GUI/input/setting_preferences.doc b/doc/salome/gui/input/setting_preferences.doc similarity index 100% rename from doc/salome/gui/GUI/input/setting_preferences.doc rename to doc/salome/gui/input/setting_preferences.doc diff --git a/doc/salome/gui/GUI/input/setting_preferences_chapter.doc b/doc/salome/gui/input/setting_preferences_chapter.doc similarity index 100% rename from doc/salome/gui/GUI/input/setting_preferences_chapter.doc rename to doc/salome/gui/input/setting_preferences_chapter.doc diff --git a/doc/salome/gui/GUI/input/setting_study_properties.doc b/doc/salome/gui/input/setting_study_properties.doc similarity index 100% rename from doc/salome/gui/GUI/input/setting_study_properties.doc rename to doc/salome/gui/input/setting_study_properties.doc diff --git a/doc/salome/gui/GUI/input/study_management_chapter.doc b/doc/salome/gui/input/study_management_chapter.doc similarity index 100% rename from doc/salome/gui/GUI/input/study_management_chapter.doc rename to doc/salome/gui/input/study_management_chapter.doc diff --git a/doc/salome/gui/GUI/input/using_catalog_generator.doc b/doc/salome/gui/input/using_catalog_generator.doc similarity index 100% rename from doc/salome/gui/GUI/input/using_catalog_generator.doc rename to doc/salome/gui/input/using_catalog_generator.doc diff --git a/doc/salome/gui/GUI/input/using_find_tool.doc b/doc/salome/gui/input/using_find_tool.doc similarity index 100% rename from doc/salome/gui/GUI/input/using_find_tool.doc rename to doc/salome/gui/input/using_find_tool.doc diff --git a/doc/salome/gui/GUI/input/using_object_browser.doc b/doc/salome/gui/input/using_object_browser.doc similarity index 100% rename from doc/salome/gui/GUI/input/using_object_browser.doc rename to doc/salome/gui/input/using_object_browser.doc diff --git a/doc/salome/gui/GUI/input/using_registry_tool.doc b/doc/salome/gui/input/using_registry_tool.doc similarity index 100% rename from doc/salome/gui/GUI/input/using_registry_tool.doc rename to doc/salome/gui/input/using_registry_tool.doc diff --git a/doc/salome/gui/GUI/input/viewers_chapter.doc b/doc/salome/gui/input/viewers_chapter.doc similarity index 100% rename from doc/salome/gui/GUI/input/viewers_chapter.doc rename to doc/salome/gui/input/viewers_chapter.doc diff --git a/doc/salome/gui/GUI/input/vtk_3d_viewer.doc b/doc/salome/gui/input/vtk_3d_viewer.doc similarity index 100% rename from doc/salome/gui/GUI/input/vtk_3d_viewer.doc rename to doc/salome/gui/input/vtk_3d_viewer.doc diff --git a/doc/salome/gui/GUI/input/working_with_python_scripts.doc b/doc/salome/gui/input/working_with_python_scripts.doc similarity index 100% rename from doc/salome/gui/GUI/input/working_with_python_scripts.doc rename to doc/salome/gui/input/working_with_python_scripts.doc diff --git a/doc/salome/gui/GUI/static/footer.html b/doc/salome/gui/static/footer.html similarity index 100% rename from doc/salome/gui/GUI/static/footer.html rename to doc/salome/gui/static/footer.html diff --git a/doc/salome/gui/GUI/static/header.html b/doc/salome/gui/static/header.html similarity index 100% rename from doc/salome/gui/GUI/static/header.html rename to doc/salome/gui/static/header.html diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index fd092e676..4b3ce3362 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -22,36 +22,20 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST+=GUI +EXTRA_DIST += images static -dev_docs: - cp -fr $(srcdir)/GUI ./INPUT; \ - cp -f ./GUI/doxyfile ./INPUT; \ - cd INPUT; \ - sed 's|../../../share/salome|$(top_srcdir)|' ./doxyfile > ./doxyfile1; \ - sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ - if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ - sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - $(DOXYGEN) -u ./doxyfile1; \ - else \ - sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - fi; \ - if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \ - sed -e 's|BUILTIN_STL_SUPPORT = NO|BUILTIN_STL_SUPPORT = YES|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - fi; \ - mv -f doxyfile1 doxyfile; \ - echo "Running doxygen in directory:"`pwd`; \ - $(DOXYGEN) ./doxyfile; \ - cd ../; \ - cp -fr $(srcdir)/GUI/sources/ GUI/ ; \ - rm -fr INPUT +dev_docs: doxyfile + echo "Running doxygen in directory: "`pwd`; \ + $(DOXYGEN) $<; -doctuidir=$(docdir)/tui/GUI +clean-local: + -rm -fr GUI doxygen.bak -nodist_doctui_DATA= GUI/doxyfile -EXTRA_DIST+= GUI/doxyfile.in +install-data-local: + if test -d GUI; then \ + $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \ + cp -rp GUI $(DESTDIR)$(docdir)/tui ; \ + fi; + +uninstall-local: + rm -rf $(docdir)/tui diff --git a/doc/salome/tui/GUI/doxyfile.in b/doc/salome/tui/doxyfile.in similarity index 92% rename from doc/salome/tui/GUI/doxyfile.in rename to doc/salome/tui/doxyfile.in index 192abd083..01db146d7 100755 --- a/doc/salome/tui/GUI/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -3,9 +3,9 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - GUI - v.@VERSION@" +PROJECT_NAME = "GUI Module Programming Guide v.@VERSION@" PROJECT_NUMBER = -OUTPUT_DIRECTORY = ../ +OUTPUT_DIRECTORY = GUI CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO @@ -15,8 +15,7 @@ ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = YES FULL_PATH_NAMES = YES -STRIP_FROM_PATH = ../../../share/salome \ - ../../../build/salome +STRIP_FROM_PATH = @top_srcdir@ @top_builddir@ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES @@ -28,7 +27,7 @@ TAB_SIZE = 5 ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_JAVA = YES -BUILTIN_STL_SUPPORT = NO +BUILTIN_STL_SUPPORT = @DOXYGEN_SUPPORT_STL@ DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES @@ -71,16 +70,16 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = log.txt +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../../../share/salome/src \ - ../../../share/salome/bin \ - ../../../share/salome/idl \ - ../../../build/salome/bin -FILE_PATTERNS = *.idl *.hxx *.cxx *.h *.c *.hh *.cc python_extension_must_be_here +INPUT = @top_srcdir@/src \ + @top_srcdir@/bin \ + @top_srcdir@/idl \ + @top_builddir@/bin +FILE_PATTERNS = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@ RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO @@ -88,7 +87,7 @@ EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = YES -IMAGE_PATH = sources/ +IMAGE_PATH = @srcdir@/images INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = YES @@ -115,11 +114,11 @@ IGNORE_PREFIX = # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = GUI +HTML_OUTPUT = . HTML_FILE_EXTENSION = .html -HTML_HEADER = sources/myheader.html -HTML_FOOTER = sources/footer.html -HTML_STYLESHEET = sources/doxygen.css +HTML_HEADER = @srcdir@/static/myheader.html +HTML_FOOTER = @srcdir@/static/footer.html +HTML_STYLESHEET = @srcdir@/static/doxygen.css HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = diff --git a/doc/salome/tui/GUI/sources/Application-About.png b/doc/salome/tui/images/Application-About.png similarity index 100% rename from doc/salome/tui/GUI/sources/Application-About.png rename to doc/salome/tui/images/Application-About.png diff --git a/doc/salome/tui/GUI/sources/application.gif b/doc/salome/tui/images/application.gif similarity index 100% rename from doc/salome/tui/GUI/sources/application.gif rename to doc/salome/tui/images/application.gif diff --git a/doc/salome/tui/GUI/sources/html_comments.gif b/doc/salome/tui/images/html_comments.gif similarity index 100% rename from doc/salome/tui/GUI/sources/html_comments.gif rename to doc/salome/tui/images/html_comments.gif diff --git a/doc/salome/tui/GUI/sources/logocorp.gif b/doc/salome/tui/images/logocorp.gif similarity index 100% rename from doc/salome/tui/GUI/sources/logocorp.gif rename to doc/salome/tui/images/logocorp.gif diff --git a/doc/salome/tui/GUI/sources/doxygen.css b/doc/salome/tui/static/doxygen.css similarity index 100% rename from doc/salome/tui/GUI/sources/doxygen.css rename to doc/salome/tui/static/doxygen.css diff --git a/doc/salome/tui/GUI/sources/footer.html b/doc/salome/tui/static/footer.html similarity index 100% rename from doc/salome/tui/GUI/sources/footer.html rename to doc/salome/tui/static/footer.html diff --git a/doc/salome/tui/GUI/sources/myheader.html b/doc/salome/tui/static/myheader.html similarity index 100% rename from doc/salome/tui/GUI/sources/myheader.html rename to doc/salome/tui/static/myheader.html diff --git a/idl/Makefile.am b/idl/Makefile.am index cd0eb79f3..73998abcf 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -26,23 +26,21 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -BASEIDL_FILES= SalomeApp_Engine.idl - -EXTRA_DIST+= $(BASEIDL_FILES) +BASEIDL_FILES = SalomeApp_Engine.idl # This variable defines the files to be installed -salomeidl_DATA = $(BASEIDL_FILES) +dist_salomeidl_DATA = $(BASEIDL_FILES) # GUI idl common library lib_LTLIBRARIES = libSalomeIDLGUI.la # Sources built from idl files -nodist_libSalomeIDLGUI_la_SOURCES= SalomeApp_EngineSK.cc +nodist_libSalomeIDLGUI_la_SOURCES = SalomeApp_EngineSK.cc # header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) +nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) -libSalomeIDLGUI_la_CPPFLAGS =\ +libSalomeIDLGUI_la_CPPFLAGS = \ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ @@ -64,14 +62,14 @@ SUFFIXES = .idl .hh SK.cc $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) - $(INSTALL) -d $(pkgpythondir) + $(INSTALL) -d $(DESTDIR)$(salomepythondir) ls $^ | while read file; do \ - $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ + $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done # uninstall-local removes too much, but it works in distcheck uninstall-local: - rm -rf $(pkgpythondir)/* + rm -rf $(DESTDIR)$(salomepythondir)/* mostlyclean-local: -rm -f *.hh *.cc .depidl diff --git a/resources/Makefile.am b/resources/Makefile.am index 2532bb03f..04249fa2f 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -25,13 +25,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - # # add resource files here ... # -dist_salomeres_DATA= +dist_salomeres_DATA = diff --git a/src/CAF/Makefile.am b/src/CAF/Makefile.am index f1c06ce16..18d31dd30 100755 --- a/src/CAF/Makefile.am +++ b/src/CAF/Makefile.am @@ -25,29 +25,29 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libcaf.la -salomeinclude_HEADERS= \ - CAF.h \ - CAF_Application.h \ - CAF_Operation.h \ - CAF_Study.h \ +salomeinclude_HEADERS = \ + CAF.h \ + CAF_Application.h \ + CAF_Operation.h \ + CAF_Study.h \ CAF_Tools.h -dist_libcaf_la_SOURCES= \ - CAF_Application.cxx \ - CAF_Operation.cxx \ - CAF_Study.cxx \ +dist_libcaf_la_SOURCES = \ + CAF_Application.cxx \ + CAF_Operation.cxx \ + CAF_Study.cxx \ CAF_Tools.cxx -MOC_FILES= \ - CAF_Application_moc.cxx \ - CAF_Operation_moc.cxx \ +MOC_FILES = \ + CAF_Application_moc.cxx \ + CAF_Operation_moc.cxx \ CAF_Study_moc.cxx -nodist_libcaf_la_SOURCES= $(MOC_FILES) +nodist_libcaf_la_SOURCES = $(MOC_FILES) nodist_salomeres_DATA = \ CAF_msg_en.qm -libcaf_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../STD -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -libcaf_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_OCAF) $(CAS_OCAFVIS) -libcaf_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la +libcaf_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../STD -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx +libcaf_la_LDFLAGS = $(QT_MT_LIBS) $(CAS_OCAF) $(CAS_OCAFVIS) +libcaf_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la diff --git a/src/CAM/Makefile.am b/src/CAM/Makefile.am index 8f96c76ca..757a523c7 100755 --- a/src/CAM/Makefile.am +++ b/src/CAM/Makefile.am @@ -25,33 +25,30 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libCAM.la -salomeinclude_HEADERS= \ - CAM.h \ - CAM_Application.h \ - CAM_DataModel.h \ - CAM_DataObject.h \ - CAM_Module.h \ +salomeinclude_HEADERS = \ + CAM.h \ + CAM_Application.h \ + CAM_DataModel.h \ + CAM_DataObject.h \ + CAM_Module.h \ CAM_Study.h -dist_libCAM_la_SOURCES= \ - CAM_Application.cxx \ - CAM_DataModel.cxx \ - CAM_DataObject.cxx \ - CAM_Module.cxx \ +dist_libCAM_la_SOURCES = \ + CAM_Application.cxx \ + CAM_DataModel.cxx \ + CAM_DataObject.cxx \ + CAM_Module.cxx \ CAM_Study.cxx -MOC_FILES= \ - CAM_Application_moc.cxx \ - CAM_Module_moc.cxx \ - CAM_Study_moc.cxx \ +MOC_FILES = \ + CAM_Application_moc.cxx \ + CAM_Module_moc.cxx \ + CAM_Study_moc.cxx \ CAM_DataModel_moc.cxx -nodist_libCAM_la_SOURCES= $(MOC_FILES) +nodist_libCAM_la_SOURCES = $(MOC_FILES) -nodist_salomeres_DATA=CAM_msg_en.qm +nodist_salomeres_DATA = CAM_msg_en.qm -libCAM_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../STD -I$(srcdir)/../Qtx -libCAM_la_LDFLAGS=$(QT_MT_LIBS) -libCAM_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la - -# what is that? -#LDFLAGSFORBIN= -lSUITApp +libCAM_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../STD -I$(srcdir)/../Qtx +libCAM_la_LDFLAGS = $(QT_MT_LIBS) +libCAM_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la diff --git a/src/CASCatch/Makefile.am b/src/CASCatch/Makefile.am index 9800bfac3..3a9f40199 100644 --- a/src/CASCatch/Makefile.am +++ b/src/CASCatch/Makefile.am @@ -23,19 +23,19 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -salomeinclude_HEADERS = CASCatch.hxx \ - CASCatch_CatchSignals.hxx \ - CASCatch_ErrorHandler.hxx \ +salomeinclude_HEADERS = CASCatch.hxx \ + CASCatch_CatchSignals.hxx \ + CASCatch_ErrorHandler.hxx \ CASCatch_Failure.hxx lib_LTLIBRARIES = libCASCatch.la -libCASCatch_la_SOURCES = \ - CASCatch_CatchSignals.cxx \ - CASCatch_ErrorHandler.cxx \ +libCASCatch_la_SOURCES = \ + CASCatch_CatchSignals.cxx \ + CASCatch_ErrorHandler.cxx \ CASCatch_Failure.cxx COMMON_CPPFLAGS = \ @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ libCASCatch_la_CPPFLAGS = $(COMMON_CPPFLAGS) -libCASCatch_la_LIBADD = $(CAS_KERNEL) +libCASCatch_la_LIBADD = $(CAS_KERNEL) diff --git a/src/DDS/Makefile.am b/src/DDS/Makefile.am index 0b8574348..4899a5ccb 100755 --- a/src/DDS/Makefile.am +++ b/src/DDS/Makefile.am @@ -38,9 +38,9 @@ dist_libDDS_la_SOURCES = \ DDS_Dictionary.cxx \ DDS_KeyWords.cxx -libDDS_la_CPPFLAGS=$(CAS_CPPFLAGS) +libDDS_la_CPPFLAGS = $(CAS_CPPFLAGS) -libDDS_la_LDFLAGS= $(CAS_KERNEL) $(CAS_OCAF) +libDDS_la_LDFLAGS = $(CAS_KERNEL) $(CAS_OCAF) diff --git a/src/Event/Makefile.am b/src/Event/Makefile.am index c848832b1..bf0eb3642 100755 --- a/src/Event/Makefile.am +++ b/src/Event/Makefile.am @@ -30,13 +30,13 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libEvent.la -salomeinclude_HEADERS= \ - Event.h \ +salomeinclude_HEADERS = \ + Event.h \ SALOME_Event.h dist_libEvent_la_SOURCES = SALOME_Event.cxx -libEvent_la_CPPFLAGS=$(QT_INCLUDES) -libEvent_la_LDFLAGS=$(QT_MT_LIBS) +libEvent_la_CPPFLAGS = $(QT_INCLUDES) +libEvent_la_LDFLAGS = $(QT_MT_LIBS) diff --git a/src/GLViewer/Makefile.am b/src/GLViewer/Makefile.am index a92dafe09..003d71047 100644 --- a/src/GLViewer/Makefile.am +++ b/src/GLViewer/Makefile.am @@ -25,91 +25,90 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libGLViewer.la -salomeinclude_HEADERS= \ - GLViewer.h \ - GLViewer_AspectLine.h \ - GLViewer_BaseDrawers.h \ - GLViewer_BaseObjects.h \ - GLViewer_Compass.h \ - GLViewer_Context.h \ - GLViewer_CoordSystem.h \ - GLViewer_Defs.h \ - GLViewer_Drawer.h \ - GLViewer_Geom.h \ - GLViewer_Grid.h \ - GLViewer_Group.h \ - GLViewer_MimeData.h \ - GLViewer_Object.h \ - GLViewer_Selector.h \ - GLViewer_Selector2d.h \ - GLViewer_Text.h \ - GLViewer_Tools.h \ - GLViewer_ToolTip.h \ - GLViewer_ViewFrame.h \ - GLViewer_ViewManager.h \ - GLViewer_ViewPort.h \ - GLViewer_ViewPort2d.h \ - GLViewer_Viewer.h \ - GLViewer_Viewer2d.h \ +salomeinclude_HEADERS = \ + GLViewer.h \ + GLViewer_AspectLine.h \ + GLViewer_BaseDrawers.h \ + GLViewer_BaseObjects.h \ + GLViewer_Compass.h \ + GLViewer_Context.h \ + GLViewer_CoordSystem.h \ + GLViewer_Defs.h \ + GLViewer_Drawer.h \ + GLViewer_Geom.h \ + GLViewer_Grid.h \ + GLViewer_Group.h \ + GLViewer_MimeData.h \ + GLViewer_Object.h \ + GLViewer_Selector.h \ + GLViewer_Selector2d.h \ + GLViewer_Text.h \ + GLViewer_Tools.h \ + GLViewer_ToolTip.h \ + GLViewer_ViewFrame.h \ + GLViewer_ViewManager.h \ + GLViewer_ViewPort.h \ + GLViewer_ViewPort2d.h \ + GLViewer_Viewer.h \ + GLViewer_Viewer2d.h \ GLViewer_Widget.h -dist_libGLViewer_la_SOURCES= \ - GLViewer_AspectLine.cxx \ - GLViewer_BaseDrawers.cxx \ - GLViewer_BaseObjects.cxx \ - GLViewer_Compass.cxx \ - GLViewer_Context.cxx \ - GLViewer_CoordSystem.cxx \ - GLViewer_Drawer.cxx \ - GLViewer_Geom.cxx \ - GLViewer_Grid.cxx \ - GLViewer_Group.cxx \ - GLViewer_MimeData.cxx \ - GLViewer_Object.cxx \ - GLViewer_Selector.cxx \ - GLViewer_Selector2d.cxx \ - GLViewer_Text.cxx \ - GLViewer_Tools.cxx \ - GLViewer_ToolTip.cxx \ - GLViewer_ViewFrame.cxx \ - GLViewer_ViewManager.cxx \ - GLViewer_ViewPort.cxx \ - GLViewer_ViewPort2d.cxx \ - GLViewer_Viewer.cxx \ - GLViewer_Viewer2d.cxx \ +dist_libGLViewer_la_SOURCES = \ + GLViewer_AspectLine.cxx \ + GLViewer_BaseDrawers.cxx \ + GLViewer_BaseObjects.cxx \ + GLViewer_Compass.cxx \ + GLViewer_Context.cxx \ + GLViewer_CoordSystem.cxx \ + GLViewer_Drawer.cxx \ + GLViewer_Geom.cxx \ + GLViewer_Grid.cxx \ + GLViewer_Group.cxx \ + GLViewer_MimeData.cxx \ + GLViewer_Object.cxx \ + GLViewer_Selector.cxx \ + GLViewer_Selector2d.cxx \ + GLViewer_Text.cxx \ + GLViewer_Tools.cxx \ + GLViewer_ToolTip.cxx \ + GLViewer_ViewFrame.cxx \ + GLViewer_ViewManager.cxx \ + GLViewer_ViewPort.cxx \ + GLViewer_ViewPort2d.cxx \ + GLViewer_Viewer.cxx \ + GLViewer_Viewer2d.cxx \ GLViewer_Widget.cxx -MOC_FILES= \ - GLViewer_Selector_moc.cxx \ - GLViewer_Selector2d_moc.cxx \ - GLViewer_ToolTip_moc.cxx \ - GLViewer_ViewFrame_moc.cxx \ - GLViewer_ViewManager_moc.cxx \ - GLViewer_ViewPort_moc.cxx \ - GLViewer_ViewPort2d_moc.cxx \ - GLViewer_Viewer_moc.cxx \ - GLViewer_Viewer2d_moc.cxx \ +MOC_FILES = \ + GLViewer_Selector_moc.cxx \ + GLViewer_Selector2d_moc.cxx \ + GLViewer_ToolTip_moc.cxx \ + GLViewer_ViewFrame_moc.cxx \ + GLViewer_ViewManager_moc.cxx \ + GLViewer_ViewPort_moc.cxx \ + GLViewer_ViewPort2d_moc.cxx \ + GLViewer_Viewer_moc.cxx \ + GLViewer_Viewer2d_moc.cxx \ GLViewer_Widget_moc.cxx -nodist_libGLViewer_la_SOURCES= $(MOC_FILES) +nodist_libGLViewer_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA= \ - resources/gl_cursor_rotate.png \ - resources/gl_cursor_sketch.png \ - resources/gl_cursor_zoom.png \ - resources/gl_view_dump.png \ - resources/gl_view_fitall.png \ - resources/gl_view_fitarea.png \ - resources/gl_view_fitselect.png \ - resources/gl_view_glpan.png \ - resources/gl_view_pan.png \ - resources/gl_view_reset.png \ +dist_salomeres_DATA = \ + resources/gl_cursor_rotate.png \ + resources/gl_cursor_sketch.png \ + resources/gl_cursor_zoom.png \ + resources/gl_view_dump.png \ + resources/gl_view_fitall.png \ + resources/gl_view_fitarea.png \ + resources/gl_view_fitselect.png \ + resources/gl_view_glpan.png \ + resources/gl_view_pan.png \ + resources/gl_view_reset.png \ resources/gl_view_zoom.png -nodist_salomeres_DATA= \ - GLViewer_images.qm \ +nodist_salomeres_DATA = \ + GLViewer_images.qm \ GLViewer_msg_en.qm -libGLViewer_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -libGLViewer_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_KERNEL) - -libGLViewer_la_LIBADD= ../SUIT/libsuit.la +libGLViewer_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx +libGLViewer_la_LDFLAGS = $(QT_MT_LIBS) $(CAS_KERNEL) +libGLViewer_la_LIBADD = ../SUIT/libsuit.la diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am index a463e61e7..fecbda7c5 100755 --- a/src/LightApp/Makefile.am +++ b/src/LightApp/Makefile.am @@ -25,229 +25,229 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libLightApp.la -salomeinclude_HEADERS= \ - LightApp.h \ - LightApp_AboutDlg.h \ - LightApp_Application.h \ - LightApp_DataModel.h \ - LightApp_DataObject.h \ - LightApp_DataOwner.h \ - LightApp_DataSubOwner.h \ - LightApp_Dialog.h \ - LightApp_Displayer.h \ - LightApp_Driver.h \ - LightApp_EventFilter.h \ - LightApp_HDFDriver.h \ - LightApp_Module.h \ - LightApp_ModuleAction.h \ - LightApp_ModuleDlg.h \ - LightApp_NameDlg.h \ - LightApp_OBSelector.h \ - LightApp_Operation.h \ - LightApp_Selection.h \ - LightApp_SelectionMgr.h \ - LightApp_ShowHideOp.h \ - LightApp_Study.h \ - LightApp_SwitchOp.h \ - LightApp_Preferences.h \ - LightApp_PreferencesDlg.h \ +salomeinclude_HEADERS = \ + LightApp.h \ + LightApp_AboutDlg.h \ + LightApp_Application.h \ + LightApp_DataModel.h \ + LightApp_DataObject.h \ + LightApp_DataOwner.h \ + LightApp_DataSubOwner.h \ + LightApp_Dialog.h \ + LightApp_Displayer.h \ + LightApp_Driver.h \ + LightApp_EventFilter.h \ + LightApp_HDFDriver.h \ + LightApp_Module.h \ + LightApp_ModuleAction.h \ + LightApp_ModuleDlg.h \ + LightApp_NameDlg.h \ + LightApp_OBSelector.h \ + LightApp_Operation.h \ + LightApp_Selection.h \ + LightApp_SelectionMgr.h \ + LightApp_ShowHideOp.h \ + LightApp_Study.h \ + LightApp_SwitchOp.h \ + LightApp_Preferences.h \ + LightApp_PreferencesDlg.h \ LightApp_UpdateFlags.h # LightApp_OBFilter.h if ENABLE_VTKVIEWER if ENABLE_SALOMEOBJECT - salomeinclude_HEADERS+= LightApp_VTKSelector.h + salomeinclude_HEADERS += LightApp_VTKSelector.h endif endif if ENABLE_OCCVIEWER - salomeinclude_HEADERS+= LightApp_OCCSelector.h + salomeinclude_HEADERS += LightApp_OCCSelector.h endif if ENABLE_GLVIEWER - salomeinclude_HEADERS+= LightApp_GLSelector.h -endif - -dist_libLightApp_la_SOURCES= \ - LightApp_AboutDlg.cxx \ - LightApp_Application.cxx \ - LightApp_DataModel.cxx \ - LightApp_DataObject.cxx \ - LightApp_DataOwner.cxx \ - LightApp_DataSubOwner.cxx \ - LightApp_Dialog.cxx \ - LightApp_Displayer.cxx \ - LightApp_Driver.cxx \ - LightApp_EventFilter.cxx \ - LightApp_HDFDriver.cxx \ - LightApp_Module.cxx \ - LightApp_ModuleAction.cxx \ - LightApp_ModuleDlg.cxx \ - LightApp_NameDlg.cxx \ - LightApp_OBSelector.cxx \ - LightApp_Operation.cxx \ - LightApp_Selection.cxx \ - LightApp_SelectionMgr.cxx \ - LightApp_ShowHideOp.cxx \ - LightApp_Study.cxx \ - LightApp_SwitchOp.cxx \ - LightApp_Preferences.cxx \ + salomeinclude_HEADERS += LightApp_GLSelector.h +endif + +dist_libLightApp_la_SOURCES = \ + LightApp_AboutDlg.cxx \ + LightApp_Application.cxx \ + LightApp_DataModel.cxx \ + LightApp_DataObject.cxx \ + LightApp_DataOwner.cxx \ + LightApp_DataSubOwner.cxx \ + LightApp_Dialog.cxx \ + LightApp_Displayer.cxx \ + LightApp_Driver.cxx \ + LightApp_EventFilter.cxx \ + LightApp_HDFDriver.cxx \ + LightApp_Module.cxx \ + LightApp_ModuleAction.cxx \ + LightApp_ModuleDlg.cxx \ + LightApp_NameDlg.cxx \ + LightApp_OBSelector.cxx \ + LightApp_Operation.cxx \ + LightApp_Selection.cxx \ + LightApp_SelectionMgr.cxx \ + LightApp_ShowHideOp.cxx \ + LightApp_Study.cxx \ + LightApp_SwitchOp.cxx \ + LightApp_Preferences.cxx \ LightApp_PreferencesDlg.cxx # LightApp_OBFilter.cxx if ENABLE_VTKVIEWER if ENABLE_SALOMEOBJECT - dist_libLightApp_la_SOURCES+= LightApp_VTKSelector.cxx + dist_libLightApp_la_SOURCES += LightApp_VTKSelector.cxx endif endif if ENABLE_OCCVIEWER - dist_libLightApp_la_SOURCES+= LightApp_OCCSelector.cxx + dist_libLightApp_la_SOURCES += LightApp_OCCSelector.cxx endif if ENABLE_GLVIEWER - dist_libLightApp_la_SOURCES+= LightApp_GLSelector.cxx -endif - -MOC_FILES= \ - LightApp_AboutDlg_moc.cxx \ - LightApp_Application_moc.cxx \ - LightApp_DataModel_moc.cxx \ - LightApp_Dialog_moc.cxx \ - LightApp_OBSelector_moc.cxx \ - LightApp_Operation_moc.cxx \ - LightApp_Module_moc.cxx \ - LightApp_ModuleAction_moc.cxx \ - LightApp_ModuleDlg_moc.cxx \ - LightApp_NameDlg_moc.cxx \ - LightApp_SelectionMgr_moc.cxx \ - LightApp_ShowHideOp_moc.cxx \ - LightApp_Study_moc.cxx \ - LightApp_SwitchOp_moc.cxx \ - LightApp_Preferences_moc.cxx \ + dist_libLightApp_la_SOURCES += LightApp_GLSelector.cxx +endif + +MOC_FILES = \ + LightApp_AboutDlg_moc.cxx \ + LightApp_Application_moc.cxx \ + LightApp_DataModel_moc.cxx \ + LightApp_Dialog_moc.cxx \ + LightApp_OBSelector_moc.cxx \ + LightApp_Operation_moc.cxx \ + LightApp_Module_moc.cxx \ + LightApp_ModuleAction_moc.cxx \ + LightApp_ModuleDlg_moc.cxx \ + LightApp_NameDlg_moc.cxx \ + LightApp_SelectionMgr_moc.cxx \ + LightApp_ShowHideOp_moc.cxx \ + LightApp_Study_moc.cxx \ + LightApp_SwitchOp_moc.cxx \ + LightApp_Preferences_moc.cxx \ LightApp_PreferencesDlg_moc.cxx if ENABLE_VTKVIEWER if ENABLE_SALOMEOBJECT - MOC_FILES+= LightApp_VTKSelector_moc.cxx + MOC_FILES += LightApp_VTKSelector_moc.cxx endif endif if ENABLE_OCCVIEWER - MOC_FILES+= LightApp_OCCSelector_moc.cxx + MOC_FILES += LightApp_OCCSelector_moc.cxx endif if ENABLE_GLVIEWER - MOC_FILES+= LightApp_GLSelector_moc.cxx -endif -nodist_libLightApp_la_SOURCES= $(MOC_FILES) - -dist_salomeres_DATA= \ - resources/icon_about.png \ - resources/icon_applogo.png \ - resources/icon_default.png \ - resources/icon_module.png \ - resources/icon_module_big.png \ - resources/icon_select.png \ - resources/LightApp.ini \ + MOC_FILES += LightApp_GLSelector_moc.cxx +endif +nodist_libLightApp_la_SOURCES = $(MOC_FILES) + +dist_salomeres_DATA = \ + resources/icon_about.png \ + resources/icon_applogo.png \ + resources/icon_default.png \ + resources/icon_module.png \ + resources/icon_module_big.png \ + resources/icon_select.png \ + resources/LightApp.ini \ resources/LightApp.xml -nodist_salomeres_DATA= \ - LightApp_images.qm \ +nodist_salomeres_DATA = \ + LightApp_images.qm \ LightApp_msg_en.qm -libLightApp_la_CPPFLAGS=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(CAS_CPPFLAGS) \ - $(HDF5_INCLUDES) @KERNEL_CXXFLAGS@ -I$(srcdir)/../SUIT -I$(srcdir)/../STD \ - -I$(srcdir)/../CAM -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LogWindow \ +libLightApp_la_CPPFLAGS = $(PYTHON_INCLUDES) $(QT_INCLUDES) $(CAS_CPPFLAGS) \ + $(HDF5_INCLUDES) @KERNEL_CXXFLAGS@ -I$(srcdir)/../SUIT -I$(srcdir)/../STD \ + -I$(srcdir)/../CAM -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LogWindow \ -I$(srcdir)/../Prs -I$(srcdir)/../Qtx -I$(srcdir)/../Event -I$(srcdir)/../Style -libLightApp_la_LDFLAGS=$(QT_MT_LIBS) +libLightApp_la_LDFLAGS = $(QT_MT_LIBS) if ENABLE_VTKVIEWER - libLightApp_la_CPPFLAGS+= $(VTK_INCLUDES) -I$(srcdir)/../VTKViewer + libLightApp_la_CPPFLAGS += $(VTK_INCLUDES) -I$(srcdir)/../VTKViewer else - libLightApp_la_CPPFLAGS+= -DDISABLE_VTKVIEWER + libLightApp_la_CPPFLAGS += -DDISABLE_VTKVIEWER endif if ENABLE_PLOT2DVIEWER - libLightApp_la_CPPFLAGS+= $(QWT_INCLUDES) -I$(srcdir)/../Plot2d + libLightApp_la_CPPFLAGS += $(QWT_INCLUDES) -I$(srcdir)/../Plot2d else - libLightApp_la_CPPFLAGS+= -DDISABLE_PLOT2DVIEWER + libLightApp_la_CPPFLAGS += -DDISABLE_PLOT2DVIEWER endif if ENABLE_OCCVIEWER - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../OCCViewer + libLightApp_la_CPPFLAGS += -I$(srcdir)/../OCCViewer else !ENABLE_OCCVIEWER - libLightApp_la_CPPFLAGS+= -DDISABLE_OCCVIEWER + libLightApp_la_CPPFLAGS += -DDISABLE_OCCVIEWER endif if ENABLE_PYCONSOLE - libLightApp_la_CPPFLAGS+= $(PYTHON_INCLUDES) -I$(srcdir)/../PyConsole -I$(srcdir)/../PyInterp - libLightApp_la_LDFLAGS+= $(PYTHON_LIBS) + libLightApp_la_CPPFLAGS += $(PYTHON_INCLUDES) -I$(srcdir)/../PyConsole -I$(srcdir)/../PyInterp + libLightApp_la_LDFLAGS += $(PYTHON_LIBS) else !ENABLE_PYCONSOLE - libLightApp_la_CPPFLAGS+= -DDISABLE_PYCONSOLE + libLightApp_la_CPPFLAGS += -DDISABLE_PYCONSOLE endif if ENABLE_GLVIEWER - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../GLViewer + libLightApp_la_CPPFLAGS += -I$(srcdir)/../GLViewer else !ENABLE_GLVIEWER - libLightApp_la_CPPFLAGS+= -DDISABLE_GLVIEWER + libLightApp_la_CPPFLAGS += -DDISABLE_GLVIEWER endif if ENABLE_SUPERVGRAPHVIEWER - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SUPERVGraph + libLightApp_la_CPPFLAGS += -I$(srcdir)/../SUPERVGraph else !ENABLE_SUPERVGRAPHVIEWER - libLightApp_la_CPPFLAGS+= -DDISABLE_SUPERVGRAPHVIEWER + libLightApp_la_CPPFLAGS += -DDISABLE_SUPERVGRAPHVIEWER endif if ENABLE_QXGRAPHVIEWER - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../QxGraph + libLightApp_la_CPPFLAGS += -I$(srcdir)/../QxGraph else !ENABLE_QXGRAPHVIEWER - libLightApp_la_CPPFLAGS+= -DDISABLE_QXGRAPHVIEWER + libLightApp_la_CPPFLAGS += -DDISABLE_QXGRAPHVIEWER endif if ENABLE_SALOMEOBJECT - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../OBJECT + libLightApp_la_CPPFLAGS += -I$(srcdir)/../OBJECT if ENABLE_PLOT2DVIEWER - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SPlot2d + libLightApp_la_CPPFLAGS += -I$(srcdir)/../SPlot2d endif if ENABLE_OCCVIEWER - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SOCC + libLightApp_la_CPPFLAGS += -I$(srcdir)/../SOCC endif if ENABLE_VTKVIEWER - libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SVTK + libLightApp_la_CPPFLAGS += -I$(srcdir)/../SVTK endif else !ENABLE_SALOMEOBJECT - libLightApp_la_CPPFLAGS+= -DDISABLE_SALOMEOBJECT + libLightApp_la_CPPFLAGS += -DDISABLE_SALOMEOBJECT endif -libLightApp_la_LIBADD= ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la \ - ../LogWindow/libLogWindow.la $(CAS_KERNEL) \ - ../Prs/libSalomePrs.la ../ObjBrowser/libObjBrowser.la ../Style/libSalomeStyle.la \ - ../Event/libEvent.la \ +libLightApp_la_LIBADD = ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la \ + ../LogWindow/libLogWindow.la $(CAS_KERNEL) \ + ../Prs/libSalomePrs.la ../ObjBrowser/libObjBrowser.la ../Style/libSalomeStyle.la \ + ../Event/libEvent.la \ $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist if ENABLE_SALOMEOBJECT - libLightApp_la_LIBADD+= ../OBJECT/libSalomeObject.la + libLightApp_la_LIBADD += ../OBJECT/libSalomeObject.la endif if ENABLE_VTKVIEWER - libLightApp_la_LIBADD+= ../VTKViewer/libVTKViewer.la + libLightApp_la_LIBADD += ../VTKViewer/libVTKViewer.la if ENABLE_SALOMEOBJECT - libLightApp_la_LIBADD+= ../SVTK/libSVTK.la + libLightApp_la_LIBADD += ../SVTK/libSVTK.la endif endif if ENABLE_OCCVIEWER - libLightApp_la_LIBADD+= ../OCCViewer/libOCCViewer.la + libLightApp_la_LIBADD += ../OCCViewer/libOCCViewer.la if ENABLE_SALOMEOBJECT - libLightApp_la_LIBADD+= ../SOCC/libSOCC.la + libLightApp_la_LIBADD += ../SOCC/libSOCC.la endif endif if ENABLE_GLVIEWER - libLightApp_la_LIBADD+= ../GLViewer/libGLViewer.la + libLightApp_la_LIBADD += ../GLViewer/libGLViewer.la endif if ENABLE_PLOT2DVIEWER - libLightApp_la_LIBADD+= ../Plot2d/libPlot2d.la + libLightApp_la_LIBADD += ../Plot2d/libPlot2d.la if ENABLE_SALOMEOBJECT - libLightApp_la_LIBADD+= ../SPlot2d/libSPlot2d.la + libLightApp_la_LIBADD += ../SPlot2d/libSPlot2d.la endif endif if ENABLE_PYCONSOLE - libLightApp_la_LIBADD+= ../PyInterp/libPyInterp.la ../PyConsole/libPyConsole.la + libLightApp_la_LIBADD += ../PyInterp/libPyInterp.la ../PyConsole/libPyConsole.la endif if ENABLE_SUPERVGRAPHVIEWER - libLightApp_la_LIBADD+= ../SUPERVGraph/libSUPERVGraph.la + libLightApp_la_LIBADD += ../SUPERVGraph/libSUPERVGraph.la endif if ENABLE_QXGRAPHVIEWER - libLightApp_la_LIBADD+= ../QxGraph/libQxGraph.la + libLightApp_la_LIBADD += ../QxGraph/libQxGraph.la endif diff --git a/src/LogWindow/Makefile.am b/src/LogWindow/Makefile.am index 898f1deaf..d196b0e4d 100755 --- a/src/LogWindow/Makefile.am +++ b/src/LogWindow/Makefile.am @@ -25,16 +25,18 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libLogWindow.la -salomeinclude_HEADERS= LogWindow.h +salomeinclude_HEADERS = LogWindow.h -dist_libLogWindow_la_SOURCES= LogWindow.cxx +dist_libLogWindow_la_SOURCES = LogWindow.cxx -MOC_FILES= LogWindow_moc.cxx +MOC_FILES = LogWindow_moc.cxx nodist_libLogWindow_la_SOURCES = $(MOC_FILES) -libLogWindow_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx +nodist_salomeres_DATA = \ + LogWindow_msg_en.qm -libLogWindow_la_LDFLAGS=$(QT_MT_LIBS) -libLogWindow_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la +libLogWindow_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx +libLogWindow_la_LDFLAGS = $(QT_MT_LIBS) +libLogWindow_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la diff --git a/src/Makefile.am b/src/Makefile.am index 82c27dbce..c9f34677f 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,3 +66,7 @@ SUBDIRS += LightApp ResExporter if GUI_ENABLE_CORBA SUBDIRS += TOOLSGUI Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT endif + +DIST_SUBDIRS = CASCatch Qtx Style DDS QDS ObjBrowser SUIT SUITApp STD CAF CAM LogWindow Prs Event \ + OBJECT GLViewer VTKViewer SVTK OCCViewer SOCC PyInterp PyConsole Plot2d SPlot2d SUPERVGraph \ + QxGraph LightApp ResExporter TOOLSGUI Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 106033a71..228a6bced 100755 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -21,51 +21,52 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libSalomeObject.la -salomeinclude_HEADERS= \ - SALOME_InteractiveObject.hxx \ - Handle_SALOME_InteractiveObject.hxx \ - SALOME_AISShape.hxx \ - Handle_SALOME_AISShape.hxx \ - SALOME_AISObject.hxx \ - Handle_SALOME_AISObject.hxx \ - SALOME_ListIO.hxx \ - SALOME_ListIteratorOfListIO.hxx \ - Handle_SALOME_ListNodeOfListIO.hxx \ - SALOME_ListNodeOfListIO.hxx \ - Handle_SALOME_Filter.hxx \ - SALOME_Filter.hxx \ - Handle_SALOME_TypeFilter.hxx \ - SALOME_TypeFilter.hxx \ - SALOME_DataMapOfIOMapOfInteger.hxx \ - SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx \ - Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx \ +salomeinclude_HEADERS = \ + SALOME_InteractiveObject.hxx \ + Handle_SALOME_InteractiveObject.hxx \ + SALOME_AISShape.hxx \ + Handle_SALOME_AISShape.hxx \ + SALOME_AISObject.hxx \ + Handle_SALOME_AISObject.hxx \ + SALOME_ListIO.hxx \ + SALOME_ListIteratorOfListIO.hxx \ + Handle_SALOME_ListNodeOfListIO.hxx \ + SALOME_ListNodeOfListIO.hxx \ + Handle_SALOME_Filter.hxx \ + SALOME_Filter.hxx \ + Handle_SALOME_TypeFilter.hxx \ + SALOME_TypeFilter.hxx \ + SALOME_DataMapOfIOMapOfInteger.hxx \ + SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx \ + SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx \ + Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx \ SALOME_Selection.h -dist_libSalomeObject_la_SOURCES= \ - SALOME_InteractiveObject.cxx \ - SALOME_AISShape.cxx\ - SALOME_AISObject.cxx\ - SALOME_ListIO_0.cxx \ - SALOME_ListIteratorOfListIO_0.cxx \ - SALOME_ListNodeOfListIO_0.cxx \ - SALOME_Filter.cxx \ - SALOME_TypeFilter.cxx \ - SALOME_DataMapOfIOMapOfInteger_0.cxx \ - SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx \ +dist_libSalomeObject_la_SOURCES = \ + SALOME_InteractiveObject.cxx \ + SALOME_AISShape.cxx \ + SALOME_AISObject.cxx \ + SALOME_ListIO_0.cxx \ + SALOME_ListIteratorOfListIO_0.cxx \ + SALOME_ListNodeOfListIO_0.cxx \ + SALOME_Filter.cxx \ + SALOME_TypeFilter.cxx \ + SALOME_DataMapOfIOMapOfInteger_0.cxx \ + SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx \ SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx -libSalomeObject_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) -libSalomeObject_la_LDFLAGS=$(QT_LIBS) $(CAS_LDPATH) -lTKV3d +libSalomeObject_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) +libSalomeObject_la_LDFLAGS = $(QT_LIBS) $(CAS_LDPATH) -lTKV3d -EXTRA_DIST+= \ - SALOME_AISObject.ixx \ - SALOME_AISObject.jxx \ - SALOME_AISShape.ixx \ - SALOME_AISShape.jxx \ - SALOME_Filter.ixx \ - SALOME_Filter.jxx \ - SALOME_InteractiveObject.ixx \ - SALOME_InteractiveObject.jxx \ - SALOME_TypeFilter.ixx \ - SALOME_TypeFilter.jxx \ - SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx +# internal (non-distributed) headers +EXTRA_DIST += \ + SALOME_AISObject.ixx \ + SALOME_AISObject.jxx \ + SALOME_AISShape.ixx \ + SALOME_AISShape.jxx \ + SALOME_Filter.ixx \ + SALOME_Filter.jxx \ + SALOME_InteractiveObject.ixx \ + SALOME_InteractiveObject.jxx \ + SALOME_TypeFilter.ixx \ + SALOME_TypeFilter.jxx diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am index fa15a4b65..0f0e24c01 100755 --- a/src/OCCViewer/Makefile.am +++ b/src/OCCViewer/Makefile.am @@ -25,82 +25,82 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libOCCViewer.la -salomeinclude_HEADERS= \ - OCCViewer_AISSelector.h \ - OCCViewer_ViewManager.h \ - OCCViewer_ViewModel.h \ - OCCViewer_ViewPort3d.h \ - OCCViewer_ViewPort.h \ - OCCViewer_ViewSketcher.h \ - OCCViewer_ViewWindow.h \ - OCCViewer_VService.h \ - OCCViewer_CreateRestoreViewDlg.h \ - OCCViewer.h \ - OCCViewer_ClippingDlg.h \ - OCCViewer_AxialScaleDlg.h \ - OCCViewer_SetRotationPointDlg.h \ +salomeinclude_HEADERS = \ + OCCViewer_AISSelector.h \ + OCCViewer_ViewManager.h \ + OCCViewer_ViewModel.h \ + OCCViewer_ViewPort3d.h \ + OCCViewer_ViewPort.h \ + OCCViewer_ViewSketcher.h \ + OCCViewer_ViewWindow.h \ + OCCViewer_VService.h \ + OCCViewer_CreateRestoreViewDlg.h \ + OCCViewer.h \ + OCCViewer_ClippingDlg.h \ + OCCViewer_AxialScaleDlg.h \ + OCCViewer_SetRotationPointDlg.h \ OCCViewer_Trihedron.h -dist_libOCCViewer_la_SOURCES= \ - OCCViewer.cxx \ - OCCViewer_AISSelector.cxx \ - OCCViewer_ViewManager.cxx \ - OCCViewer_ViewModel.cxx \ - OCCViewer_ViewPort3d.cxx \ - OCCViewer_ViewPort.cxx \ - OCCViewer_ViewSketcher.cxx \ - OCCViewer_ViewWindow.cxx \ - OCCViewer_VService.cxx \ - OCCViewer_CreateRestoreViewDlg.cxx \ - OCCViewer_SetRotationPointDlg.cxx \ - OCCViewer_ClippingDlg.cxx \ - OCCViewer_AxialScaleDlg.cxx \ +dist_libOCCViewer_la_SOURCES = \ + OCCViewer.cxx \ + OCCViewer_AISSelector.cxx \ + OCCViewer_ViewManager.cxx \ + OCCViewer_ViewModel.cxx \ + OCCViewer_ViewPort3d.cxx \ + OCCViewer_ViewPort.cxx \ + OCCViewer_ViewSketcher.cxx \ + OCCViewer_ViewWindow.cxx \ + OCCViewer_VService.cxx \ + OCCViewer_CreateRestoreViewDlg.cxx \ + OCCViewer_SetRotationPointDlg.cxx \ + OCCViewer_ClippingDlg.cxx \ + OCCViewer_AxialScaleDlg.cxx \ OCCViewer_Trihedron.cxx -MOC_FILES= \ - OCCViewer_AISSelector_moc.cxx \ - OCCViewer_ViewModel_moc.cxx \ - OCCViewer_ViewPort3d_moc.cxx \ - OCCViewer_ViewPort_moc.cxx \ - OCCViewer_ViewSketcher_moc.cxx \ - OCCViewer_ViewWindow_moc.cxx \ - OCCViewer_ViewManager_moc.cxx \ - OCCViewer_CreateRestoreViewDlg_moc.cxx \ - OCCViewer_SetRotationPointDlg_moc.cxx \ - OCCViewer_ClippingDlg_moc.cxx \ +MOC_FILES = \ + OCCViewer_AISSelector_moc.cxx \ + OCCViewer_ViewModel_moc.cxx \ + OCCViewer_ViewPort3d_moc.cxx \ + OCCViewer_ViewPort_moc.cxx \ + OCCViewer_ViewSketcher_moc.cxx \ + OCCViewer_ViewWindow_moc.cxx \ + OCCViewer_ViewManager_moc.cxx \ + OCCViewer_CreateRestoreViewDlg_moc.cxx \ + OCCViewer_SetRotationPointDlg_moc.cxx \ + OCCViewer_ClippingDlg_moc.cxx \ OCCViewer_AxialScaleDlg_moc.cxx -nodist_libOCCViewer_la_SOURCES= $(MOC_FILES) +nodist_libOCCViewer_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA = \ - resources/occ_view_back.png \ - resources/occ_view_bottom.png \ - resources/occ_view_camera_dump.png \ - resources/occ_view_clone.png \ - resources/occ_view_clipping.png \ - resources/occ_view_clipping_pressed.png \ - resources/occ_view_scaling.png \ - resources/occ_view_fitall.png \ - resources/occ_view_fitarea.png \ - resources/occ_view_front.png \ - resources/occ_view_glpan.png \ - resources/occ_view_left.png \ - resources/occ_view_pan.png \ - resources/occ_view_presets.png \ - resources/occ_view_reset.png \ - resources/occ_view_right.png \ - resources/occ_view_rotate.png \ - resources/occ_view_shoot.png \ - resources/occ_view_top.png \ - resources/occ_view_triedre.png \ - resources/occ_view_zoom.png \ +dist_salomeres_DATA = \ + resources/occ_view_back.png \ + resources/occ_view_bottom.png \ + resources/occ_view_camera_dump.png \ + resources/occ_view_clone.png \ + resources/occ_view_clipping.png \ + resources/occ_view_clipping_pressed.png \ + resources/occ_view_scaling.png \ + resources/occ_view_fitall.png \ + resources/occ_view_fitarea.png \ + resources/occ_view_front.png \ + resources/occ_view_glpan.png \ + resources/occ_view_left.png \ + resources/occ_view_pan.png \ + resources/occ_view_presets.png \ + resources/occ_view_reset.png \ + resources/occ_view_right.png \ + resources/occ_view_rotate.png \ + resources/occ_view_shoot.png \ + resources/occ_view_top.png \ + resources/occ_view_triedre.png \ + resources/occ_view_zoom.png \ resources/occ_view_rotation_point.png -nodist_salomeres_DATA = \ - OCCViewer_images.qm \ +nodist_salomeres_DATA = \ + OCCViewer_images.qm \ OCCViewer_msg_en.qm -libOCCViewer_la_CPPFLAGS=$(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \ +libOCCViewer_la_CPPFLAGS = $(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \ -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -libOCCViewer_la_LDFLAGS=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) -lTKOpenGl -libOCCViewer_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la +libOCCViewer_la_LDFLAGS = $(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) -lTKOpenGl +libOCCViewer_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la diff --git a/src/ObjBrowser/Makefile.am b/src/ObjBrowser/Makefile.am index 9d427d9c7..0c9efe47f 100755 --- a/src/ObjBrowser/Makefile.am +++ b/src/ObjBrowser/Makefile.am @@ -25,32 +25,24 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libObjBrowser.la -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ OB.h \ OB_Browser.h -# OB_ListItem.h \ - OB_ListView.h - OB_Filter.h +# OB_Filter.h -dist_libObjBrowser_la_SOURCES= \ +dist_libObjBrowser_la_SOURCES = \ OB_Browser.cxx -# OB_ListView.cxx - OB_ListItem.cxx \ - OB_ListView.cxx \ - OB_Filter.cxx +# OB_Filter.cxx -MOC_FILES= \ +MOC_FILES = \ OB_Browser_moc.cxx -# OB_ListView_moc.cxx - -nodist_libObjBrowser_la_SOURCES= $(MOC_FILES) +nodist_libObjBrowser_la_SOURCES = $(MOC_FILES) nodist_salomeres_DATA = OB_msg_en.qm -libObjBrowser_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../Qtx - -libObjBrowser_la_LDFLAGS=$(QT_MT_LIBS) -libObjBrowser_la_LIBADD= ../Qtx/libqtx.la +libObjBrowser_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../Qtx +libObjBrowser_la_LDFLAGS = $(QT_MT_LIBS) +libObjBrowser_la_LIBADD = ../Qtx/libqtx.la diff --git a/src/Plot2d/Makefile.am b/src/Plot2d/Makefile.am index b8e08f99e..fcc63aec1 100755 --- a/src/Plot2d/Makefile.am +++ b/src/Plot2d/Makefile.am @@ -23,71 +23,71 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -lib_LTLIBRARIES= libPlot2d.la +lib_LTLIBRARIES = libPlot2d.la # header files -salomeinclude_HEADERS= \ - Plot2d.h \ - Plot2d_Curve.h \ - Plot2d_FitDataDlg.h \ - Plot2d_Prs.h \ - Plot2d_SetupViewDlg.h \ - Plot2d_ViewFrame.h \ - Plot2d_ViewManager.h \ - Plot2d_ViewModel.h \ - Plot2d_ViewWindow.h \ - Plot2d_SetupCurveDlg.h \ +salomeinclude_HEADERS = \ + Plot2d.h \ + Plot2d_Curve.h \ + Plot2d_FitDataDlg.h \ + Plot2d_Prs.h \ + Plot2d_SetupViewDlg.h \ + Plot2d_ViewFrame.h \ + Plot2d_ViewManager.h \ + Plot2d_ViewModel.h \ + Plot2d_ViewWindow.h \ + Plot2d_SetupCurveDlg.h \ Plot2d_ToolTip.h -dist_libPlot2d_la_SOURCES= \ - Plot2d.cxx \ - Plot2d_Curve.cxx \ - Plot2d_FitDataDlg.cxx \ - Plot2d_Prs.cxx \ - Plot2d_SetupViewDlg.cxx \ - Plot2d_ViewFrame.cxx \ - Plot2d_ViewManager.cxx \ - Plot2d_ViewModel.cxx \ - Plot2d_ViewWindow.cxx \ - Plot2d_SetupCurveDlg.cxx \ +dist_libPlot2d_la_SOURCES = \ + Plot2d.cxx \ + Plot2d_Curve.cxx \ + Plot2d_FitDataDlg.cxx \ + Plot2d_Prs.cxx \ + Plot2d_SetupViewDlg.cxx \ + Plot2d_ViewFrame.cxx \ + Plot2d_ViewManager.cxx \ + Plot2d_ViewModel.cxx \ + Plot2d_ViewWindow.cxx \ + Plot2d_SetupCurveDlg.cxx \ Plot2d_ToolTip.cxx -MOC_FILES = \ - Plot2d_FitDataDlg_moc.cxx \ - Plot2d_SetupViewDlg_moc.cxx \ - Plot2d_ViewFrame_moc.cxx \ - Plot2d_ViewManager_moc.cxx \ - Plot2d_ViewModel_moc.cxx \ - Plot2d_ViewWindow_moc.cxx \ - Plot2d_SetupCurveDlg_moc.cxx \ +MOC_FILES = \ + Plot2d_FitDataDlg_moc.cxx \ + Plot2d_SetupViewDlg_moc.cxx \ + Plot2d_ViewFrame_moc.cxx \ + Plot2d_ViewManager_moc.cxx \ + Plot2d_ViewModel_moc.cxx \ + Plot2d_ViewWindow_moc.cxx \ + Plot2d_SetupCurveDlg_moc.cxx \ Plot2d_ToolTip_moc.cxx -nodist_libPlot2d_la_SOURCES= $(MOC_FILES) +nodist_libPlot2d_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA = \ - resources/plot2d_clone.png \ - resources/plot2d_camera_dump.png \ - resources/plot2d_fitall.png \ - resources/plot2d_fitarea.png \ - resources/plot2d_glpan.png \ - resources/plot2d_legend.png \ - resources/plot2d_linear.png \ - resources/plot2d_linear_y.png \ - resources/plot2d_lines.png \ - resources/plot2d_log.png \ - resources/plot2d_log_y.png \ - resources/plot2d_pan.png \ - resources/plot2d_points.png \ - resources/plot2d_settings.png \ - resources/plot2d_splines.png \ +dist_salomeres_DATA = \ + resources/plot2d_clone.png \ + resources/plot2d_camera_dump.png \ + resources/plot2d_fitall.png \ + resources/plot2d_fitarea.png \ + resources/plot2d_glpan.png \ + resources/plot2d_legend.png \ + resources/plot2d_linear.png \ + resources/plot2d_linear_y.png \ + resources/plot2d_lines.png \ + resources/plot2d_log.png \ + resources/plot2d_log_y.png \ + resources/plot2d_pan.png \ + resources/plot2d_points.png \ + resources/plot2d_settings.png \ + resources/plot2d_splines.png \ resources/plot2d_zoom.png -nodist_salomeres_DATA= \ - Plot2d_images.qm \ +nodist_salomeres_DATA = \ + Plot2d_images.qm \ Plot2d_msg_en.qm -libPlot2d_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) \ +libPlot2d_la_CPPFLAGS = $(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) \ -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -libPlot2d_la_LDFLAGS=$(QWT_LIBS) $(QT_MT_LIBS) ../SUIT/libsuit.la +libPlot2d_la_LDFLAGS = $(QWT_LIBS) $(QT_MT_LIBS) ../SUIT/libsuit.la diff --git a/src/PyConsole/Makefile.am b/src/PyConsole/Makefile.am index a32cef86f..a975b1b94 100755 --- a/src/PyConsole/Makefile.am +++ b/src/PyConsole/Makefile.am @@ -25,28 +25,28 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libPyConsole.la -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ PyConsole.h \ PyConsole_Console.h \ PyConsole_Editor.h \ PyConsole_Interp.h -dist_libPyConsole_la_SOURCES= \ +dist_libPyConsole_la_SOURCES = \ PyConsole_Console.cxx \ PyConsole_Editor.cxx \ PyConsole_Interp.cxx -MOC_FILES= \ +MOC_FILES = \ PyConsole_Editor_moc.cxx \ PyConsole_Console_moc.cxx -nodist_libPyConsole_la_SOURCES= $(MOC_FILES) +nodist_libPyConsole_la_SOURCES = $(MOC_FILES) -nodist_salomeres_DATA= \ +nodist_salomeres_DATA = \ PyConsole_msg_en.qm -libPyConsole_la_CPPFLAGS= $(PYTHON_INCLUDES) $(QT_INCLUDES) \ +libPyConsole_la_CPPFLAGS = $(PYTHON_INCLUDES) $(QT_INCLUDES) \ -I$(srcdir)/../PyInterp -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -libPyConsole_la_LDFLAGS= $(PYTHON_LIBS) $(QT_MT_LIBS) -libPyConsole_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la ../PyInterp/libPyInterp.la +libPyConsole_la_LDFLAGS = $(PYTHON_LIBS) $(QT_MT_LIBS) +libPyConsole_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../PyInterp/libPyInterp.la diff --git a/src/PyInterp/Makefile.am b/src/PyInterp/Makefile.am index c601b310d..049d1b3db 100755 --- a/src/PyInterp/Makefile.am +++ b/src/PyInterp/Makefile.am @@ -27,18 +27,18 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libPyInterp.la -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ PyInterp.h \ PyInterp_Interp.h \ PyInterp_Dispatcher.h -dist_libPyInterp_la_SOURCES= \ +dist_libPyInterp_la_SOURCES = \ PyInterp_Interp.cxx \ PyInterp_Dispatcher.cxx -MOC_FILES= PyInterp_Watcher_moc.cxx -nodist_libPyInterp_la_SOURCES= $(MOC_FILES) +MOC_FILES = PyInterp_Watcher_moc.cxx +nodist_libPyInterp_la_SOURCES = $(MOC_FILES) -libPyInterp_la_CPPFLAGS= $(PYTHON_INCLUDES) $(QT_INCLUDES) \ +libPyInterp_la_CPPFLAGS = $(PYTHON_INCLUDES) $(QT_INCLUDES) \ -I$(srcdir)/../Event -libPyInterp_la_LDFLAGS= $(PYTHON_LIBS) $(QT_MT_LIBS) ../Event/libEvent.la +libPyInterp_la_LDFLAGS = $(PYTHON_LIBS) $(QT_MT_LIBS) ../Event/libEvent.la diff --git a/src/QDS/Makefile.am b/src/QDS/Makefile.am index 6392bdf10..7509c730d 100755 --- a/src/QDS/Makefile.am +++ b/src/QDS/Makefile.am @@ -28,7 +28,7 @@ lib_LTLIBRARIES = libQDS.la # header files #MKR: already migrated to Qt4 files -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ QDS.h \ QDS_CheckBox.h \ QDS_ComboBox.h \ @@ -45,7 +45,7 @@ salomeinclude_HEADERS= \ QDS_Table.h #MKR: already migrated to Qt4 files -dist_libQDS_la_SOURCES= \ +dist_libQDS_la_SOURCES = \ QDS.cxx \ QDS_CheckBox.cxx \ QDS_ComboBox.cxx \ @@ -62,28 +62,27 @@ dist_libQDS_la_SOURCES= \ QDS_Table.cxx #MKR: already migrated to Qt4 files -MOC_FILES= \ - QDS_CheckBox_moc.cxx \ - QDS_ComboBox_moc.cxx \ - QDS_Datum_moc.cxx \ - QDS_LineEdit_moc.cxx \ - QDS_SpinBox_moc.cxx \ - QDS_SpinBoxDbl_moc.cxx \ - QDS_TextEdit_moc.cxx \ +MOC_FILES = \ + QDS_CheckBox_moc.cxx \ + QDS_ComboBox_moc.cxx \ + QDS_Datum_moc.cxx \ + QDS_LineEdit_moc.cxx \ + QDS_SpinBox_moc.cxx \ + QDS_SpinBoxDbl_moc.cxx \ + QDS_TextEdit_moc.cxx \ QDS_RadioBox_moc.cxx #MKR: not yet migrated to Qt4 files # \ QDS_Table_moc.cxx -nodist_libQDS_la_SOURCES= $(MOC_FILES) +nodist_libQDS_la_SOURCES = $(MOC_FILES) -# may be neccessary for the external projects or future improvements -EXTRA_DIST+= QDS_RadioBox.cxx QDS_RadioBox.h resources/QDS_msg_en.po +nodist_salomeres_DATA = QDS_msg_en.qm -libQDS_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) \ +libQDS_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) \ -I$(srcdir)/../Qtx -I$(srcdir)/../DDS -libQDS_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_KERNEL) -libQDS_la_LIBADD=../DDS/libDDS.la ../Qtx/libqtx.la +libQDS_la_LDFLAGS = $(QT_MT_LIBS) $(CAS_KERNEL) +libQDS_la_LIBADD = ../DDS/libDDS.la ../Qtx/libqtx.la diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am index 414630951..84a178835 100755 --- a/src/Qtx/Makefile.am +++ b/src/Qtx/Makefile.am @@ -26,7 +26,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files #VSR: already migrated to Qt4 files -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ Qtx.h \ QtxAction.h \ QtxActionMenuMgr.h \ @@ -79,10 +79,10 @@ salomeinclude_HEADERS= \ # Libraries targets -lib_LTLIBRARIES= libqtx.la +lib_LTLIBRARIES = libqtx.la #VSR: already migrated to Qt4 files -dist_libqtx_la_SOURCES= \ +dist_libqtx_la_SOURCES = \ Qtx.cxx \ QtxAction.cxx \ QtxActionMenuMgr.cxx \ @@ -133,7 +133,7 @@ dist_libqtx_la_SOURCES= \ QtxTable.cxx #VSR: already migrated to Qt4 files -MOC_FILES= \ +MOC_FILES = \ QtxAction_moc.cxx \ QtxActionMenuMgr_moc.cxx \ QtxActionMgr_moc.cxx \ @@ -177,8 +177,7 @@ MOC_FILES= \ QtxListBox_moc.cxx \ QtxTable_moc.cxx -nodist_libqtx_la_SOURCES= $(MOC_FILES) +nodist_libqtx_la_SOURCES = $(MOC_FILES) -libqtx_la_CPPFLAGS=$(QT_INCLUDES) - -libqtx_la_LDFLAGS=$(QT_MT_LIBS) +libqtx_la_CPPFLAGS = $(QT_INCLUDES) +libqtx_la_LDFLAGS = $(QT_MT_LIBS) diff --git a/src/QxGraph/Makefile.am b/src/QxGraph/Makefile.am index 292084f65..dd3a0949e 100755 --- a/src/QxGraph/Makefile.am +++ b/src/QxGraph/Makefile.am @@ -21,46 +21,46 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libQxGraph.la -salomeinclude_HEADERS= \ - QxGraph_ActiveItem.h \ - QxGraph_Prs.h \ - QxGraph_Canvas.h \ - QxGraph_CanvasView.h \ - QxGraph_ViewWindow.h \ - QxGraph_ViewManager.h \ - QxGraph_ViewModel.h \ - QxGraph_Def.h \ +salomeinclude_HEADERS = \ + QxGraph_ActiveItem.h \ + QxGraph_Prs.h \ + QxGraph_Canvas.h \ + QxGraph_CanvasView.h \ + QxGraph_ViewWindow.h \ + QxGraph_ViewManager.h \ + QxGraph_ViewModel.h \ + QxGraph_Def.h \ QxGraph.h -dist_libQxGraph_la_SOURCES= \ - QxGraph_Prs.cxx \ - QxGraph_Canvas.cxx \ - QxGraph_CanvasView.cxx \ - QxGraph_ViewWindow.cxx \ - QxGraph_ViewManager.cxx \ +dist_libQxGraph_la_SOURCES = \ + QxGraph_Prs.cxx \ + QxGraph_Canvas.cxx \ + QxGraph_CanvasView.cxx \ + QxGraph_ViewWindow.cxx \ + QxGraph_ViewManager.cxx \ QxGraph_ViewModel.cxx -MOC_FILES= \ - QxGraph_Canvas_moc.cxx \ - QxGraph_CanvasView_moc.cxx \ - QxGraph_ViewWindow_moc.cxx \ - QxGraph_ViewManager_moc.cxx \ +MOC_FILES = \ + QxGraph_Canvas_moc.cxx \ + QxGraph_CanvasView_moc.cxx \ + QxGraph_ViewWindow_moc.cxx \ + QxGraph_ViewManager_moc.cxx \ QxGraph_ViewModel_moc.cxx -nodist_libQxGraph_la_SOURCES= $(MOC_FILES) +nodist_libQxGraph_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA= \ - resources/qx_view_fitall.png \ - resources/qx_view_fitarea.png \ - resources/qx_view_glpan.png \ - resources/qx_view_pan.png \ - resources/qx_view_reset.png \ +dist_salomeres_DATA = \ + resources/qx_view_fitall.png \ + resources/qx_view_fitarea.png \ + resources/qx_view_glpan.png \ + resources/qx_view_pan.png \ + resources/qx_view_reset.png \ resources/qx_view_zoom.png -nodist_salomeres_DATA= \ - QxGraph_images.qm \ +nodist_salomeres_DATA = \ + QxGraph_images.qm \ QxGraph_msg_en.qm -libQxGraph_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -libQxGraph_la_LDFLAGS=$(QT_MT_LIBS) ../SUIT/libsuit.la +libQxGraph_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT +libQxGraph_la_LDFLAGS = $(QT_MT_LIBS) ../SUIT/libsuit.la diff --git a/src/ResExporter/Makefile.am b/src/ResExporter/Makefile.am index 8021b5aab..c8e1c6b5e 100755 --- a/src/ResExporter/Makefile.am +++ b/src/ResExporter/Makefile.am @@ -19,11 +19,10 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -bin_PROGRAMS= ResourceExporter +bin_PROGRAMS = ResourceExporter -dist_ResourceExporter_SOURCES=ResourceExporter.cxx +dist_ResourceExporter_SOURCES = ResourceExporter.cxx -ResourceExporter_CPPFLAGS= $(QT_INCLUDES) -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT - -ResourceExporter_LDFLAGS= $(QT_MT_LIBS) -ResourceExporter_LDADD= ../SUIT/libsuit.la ../Qtx/libqtx.la +ResourceExporter_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT +ResourceExporter_LDFLAGS = $(QT_MT_LIBS) +ResourceExporter_LDADD = ../SUIT/libsuit.la ../Qtx/libqtx.la diff --git a/src/SALOME_PY/Makefile.am b/src/SALOME_PY/Makefile.am index 6d94b90d4..d50759a75 100755 --- a/src/SALOME_PY/Makefile.am +++ b/src/SALOME_PY/Makefile.am @@ -28,10 +28,10 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -lib_LTLIBRARIES= libSalomePy.la -dist_libSalomePy_la_SOURCES= SalomePy.cxx +lib_LTLIBRARIES = libSalomePy.la +dist_libSalomePy_la_SOURCES = SalomePy.cxx -libSalomePy_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \ +libSalomePy_la_CPPFLAGS = $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \ $(OGL_INCLUDES) $(CAS_CXXFLAGS) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ \ -DHAVE_CONFIG_H -I$(srcdir)/../SalomeApp -I$(srcdir)/../LightApp \ -I$(srcdir)/../Event -I$(srcdir)/../Session -I$(srcdir)/../SVTK \ @@ -39,6 +39,6 @@ libSalomePy_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \ -I$(srcdir)/../STD -I$(srcdir)/../VTKViewer -I$(srcdir)/../OBJECT \ @CAS_CPPFLAGS@ \ -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -libSalomePy_la_LDFLAGS=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) \ +libSalomePy_la_LDFLAGS = $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) \ ../SalomeApp/libSalomeApp.la \ -lvtkCommonPythonD -lvtkGraphicsPythonD -lvtkImagingPythonD diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am index 9dbaea88d..3764ddddc 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am @@ -24,51 +24,56 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am ###################### -# Library target -lib_LTLIBRARIES= libSalomePyQtGUI.la +# library target +lib_LTLIBRARIES = libSalomePyQtGUI.la -SIP_SRC = sipSalomePyQtGUIcmodule.cc +# extra source files (generated by sip) +SIP_SRC = sipAPISalomePyQtGUI.h \ + sipSalomePyQtGUIcmodule.cc + +# Sip definition file SIP_FILES = SALOME_PYQT_GUI.sip +# extra dist files EXTRA_DIST += $(SIP_FILES) -salomeinclude_HEADERS = \ - SALOME_PYQT_GUI.h \ - SALOME_PYQT_PyInterp.h \ - SALOME_PYQT_Module.h +# extra clean files +CLEANFILES = $(SIP_SRC) -dist_libSalomePyQtGUI_la_SOURCES= \ - SALOME_PYQT_PyInterp.cxx \ - SALOME_PYQT_Module.cxx +# moc files (generated my moc) +MOC_FILES = SALOME_PYQT_Module_moc.cxx -dist_libSalomePyQtGUI_la_SOURCES: $(SIP_SRC) - -# moc pre-processing -MOC_FILES= SALOME_PYQT_Module_moc.cxx -nodist_libSalomePyQtGUI_la_SOURCES= $(MOC_FILES) $(SIP_SRC) +# exported header files +salomeinclude_HEADERS = \ + SALOME_PYQT_GUI.h \ + SALOME_PYQT_PyInterp.h \ + SALOME_PYQT_Module.h -libSalomePyQtGUI_la_CPPFLAGS= $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ - $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ - -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -DCALL_OLD_METHODS \ - -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp \ - -I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp \ - -I$(srcdir)/../../Plot2d -I$(srcdir)/../../OCCViewer \ - -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \ +# library sources +dist_libSalomePyQtGUI_la_SOURCES = \ + SALOME_PYQT_PyInterp.cxx \ + SALOME_PYQT_Module.cxx +nodist_libSalomePyQtGUI_la_SOURCES = $(MOC_FILES) $(SIP_SRC) + +# compilation flags +libSalomePyQtGUI_la_CPPFLAGS = $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ + -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -DCALL_OLD_METHODS \ + -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp \ + -I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp \ + -I$(srcdir)/../../Plot2d -I$(srcdir)/../../OCCViewer \ + -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \ -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -libSalomePyQtGUI_la_LIBADD= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \ - $(OGL_LIBS) ../../PyInterp/libPyInterp.la ../../SalomeApp/libSalomeApp.la \ - ../../OCCViewer/libOCCViewer.la ../../Plot2d/libPlot2d.la -################################## +# linkage flags +libSalomePyQtGUI_la_LIBADD = $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \ + $(OGL_LIBS) ../../PyInterp/libPyInterp.la ../../SalomeApp/libSalomeApp.la \ + ../../OCCViewer/libOCCViewer.la ../../Plot2d/libPlot2d.la # Custom build step: generate C++ wrapping according to $(SIP_FILES) - $(SIP_SRC): $(SIP_FILES) $(SIP) $(PYQT_SIPFLAGS) $< +# extra dependency (SALOME_PYQT_Module.cxx depends on header files generated by sip) $(dist_libSalomePyQtGUI_la_SOURCES): $(SIP_SRC) -################################### - -mostlyclean-local: - rm -f sip* diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am index ee24c1d7d..7622446d1 100644 --- a/src/SALOME_PYQT/SalomePyQt/Makefile.am +++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am @@ -22,55 +22,66 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -# Sip common sources -SIP_SRC = sipSalomePyQtSalomePyQt.cc \ +# extra source files (generated by sip) +SIP_SRC = sipAPISalomePyQt.h \ + sipSalomePyQtSalomePyQt.cc \ sipSalomePyQtSALOME_Selection.cc \ - sipSalomePyQtQtxAction.cc \ - sipSalomePyQtcmodule.cc + sipSalomePyQtQtxAction.cc \ + sipSalomePyQtcmodule.cc # Sip definition file SIP_FILES = SalomePyQt.sip -EXTRA_DIST += SalomePyQt.sip +# extra dist files +EXTRA_DIST += $(SIP_FILES) -# Libraries targets +# extra clean files +CLEANFILES = $(SIP_SRC) + +# moc files (generated my moc) MOC_FILES = SalomePyQt_moc.cxx -COMMON_CPP_FLAGS=$(QT_INCLUDES) $(QWT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ - $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ - -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -I$(top_builddir)/salomeadn/unix \ - -I$(top_builddir)/idl \ - -I$(srcdir)/../../SUIT -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \ - -I$(srcdir)/../../Qtx -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../Event \ - -I$(srcdir)/../../SalomeSession -I$(srcdir)/../../LogWindow \ - -I$(srcdir)/../../VTKViewer -I$(srcdir)/../../TOOLSGUI \ - -I$(srcdir)/../../OCCViewer -I$(srcdir)/../../Plot2d \ - -I$(srcdir)/../SALOME_PYQT_GUI -I$(srcdir)/../../PyInterp \ - -I$(srcdir)/../../LightApp -I$(srcdir)/../../ObjBrowser \ - -I$(srcdir)/../../OBJECT \ +# compilation flags +COMMON_CPP_FLAGS = $(QT_INCLUDES) $(QWT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ + -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -I$(top_builddir)/salomeadn/unix \ + -I$(top_builddir)/idl \ + -I$(srcdir)/../../SUIT -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \ + -I$(srcdir)/../../Qtx -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../Event \ + -I$(srcdir)/../../SalomeSession -I$(srcdir)/../../LogWindow \ + -I$(srcdir)/../../VTKViewer -I$(srcdir)/../../TOOLSGUI \ + -I$(srcdir)/../../OCCViewer -I$(srcdir)/../../Plot2d \ + -I$(srcdir)/../SALOME_PYQT_GUI -I$(srcdir)/../../PyInterp \ + -I$(srcdir)/../../LightApp -I$(srcdir)/../../ObjBrowser \ + -I$(srcdir)/../../OBJECT \ -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -COMMON_LIBS=$(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(QWT_LIBS) \ - $(OGL_LIBS) ../../SUIT/libsuit.la ../../CAM/libCAM.la ../../STD/libstd.la \ - ../../Qtx/libqtx.la ../../SalomeApp/libSalomeApp.la ../../Event/libEvent.la \ - ../../Session/libSalomeSession.la ../../LogWindow/libLogWindow.la \ - ../../VTKViewer/libVTKViewer.la ../../TOOLSGUI/libToolsGUI.la \ - ../SALOME_PYQT_GUI/libSalomePyQtGUI.la ../../OCCViewer/libOCCViewer.la \ +# linkage flags +COMMON_LIBS = $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(QWT_LIBS) \ + $(OGL_LIBS) ../../SUIT/libsuit.la ../../CAM/libCAM.la ../../STD/libstd.la \ + ../../Qtx/libqtx.la ../../SalomeApp/libSalomeApp.la ../../Event/libEvent.la \ + ../../Session/libSalomeSession.la ../../LogWindow/libLogWindow.la \ + ../../VTKViewer/libVTKViewer.la ../../TOOLSGUI/libToolsGUI.la \ + ../SALOME_PYQT_GUI/libSalomePyQtGUI.la ../../OCCViewer/libOCCViewer.la \ ../../Plot2d/libPlot2d.la +# libraries targets lib_LTLIBRARIES = libSalomePyQt.la -dist_libSalomePyQt_la_SOURCES= SalomePyQt.cxx -nodist_libSalomePyQt_la_SOURCES= $(MOC_FILES) $(SIP_SRC) + +# library sources / rules +dist_libSalomePyQt_la_SOURCES = SalomePyQt.cxx +nodist_libSalomePyQt_la_SOURCES = $(MOC_FILES) $(SIP_SRC) libSalomePyQt_la_CPPFLAGS = $(COMMON_CPP_FLAGS) libSalomePyQt_la_LIBADD = $(COMMON_LIBS) -# Custom build step: generate C++ wrapping according to $(SIP_FILES) +# custom build step: generate C++ wrapping according to $(SIP_FILES) $(SIP_SRC): $(SIP_FILES) $(SIP) $(PYQT_SIPFLAGS) $< -install-exec-hook: $(libdir)/SalomePyQt.so -$(libdir)/SalomePyQt.so: - (cd $(libdir); ln -s libSalomePyQt.so SalomePyQt.so;) +# custom install step: create symbolic link +install-exec-hook: + (cd $(DESTDIR)$(libdir); ln -sf libSalomePyQt.so SalomePyQt.so) -mostlyclean-local: - rm -f sip* +# custom uninstall step: remove symbolic link +uninstall-hook: + rm -f $(DESTDIR)$(libdir)/SalomePyQt.so diff --git a/src/SALOME_SWIG/Makefile.am b/src/SALOME_SWIG/Makefile.am index 54436da3f..e354f93de 100755 --- a/src/SALOME_SWIG/Makefile.am +++ b/src/SALOME_SWIG/Makefile.am @@ -44,46 +44,43 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # # The file libSALOME_Swig.py will be installed in the # /lib/python/site-package/salome folder. -# The library libSALOME_Swigcmodule.so will be installed in +# The library _libSALOME_Swig.so will be installed in # the /lib/salome folder. # -# this option puts it to dist -#BUILT_SOURCES = swig_wrap.cpp - SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) SWIG_SOURCES = libSALOME_Swig.i -nodist_pkgpython_DATA = libSALOME_Swig.py +nodist_salomepython_PYTHON = libSALOME_Swig.py libSALOME_Swig.py: swig_wrap.cpp # library -lib_LTLIBRARIES = libSALOME_Swigcmodule.la -libSALOME_Swigcmodule_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) SALOMEGUI_Swig.cxx -nodist_libSALOME_Swigcmodule_la_SOURCES = swig_wrap.cpp -salomeinclude_HEADERS= SALOMEGUI_Swig.hxx SALOMEGUI_Swig.i - -libSALOME_Swigcmodule_la_CPPFLAGS =\ - $(QT_INCLUDES) $(QWT_INCLUDES) $(PYTHON_INCLUDES) $(CAS_CPPFLAGS) $(VTK_INCLUDES) \ - $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ \ - -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ - -I$(srcdir)/../SalomeApp -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT \ - -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LightApp -I$(srcdir)/../SOCC \ - -I$(srcdir)/../SVTK -I$(srcdir)/../Event -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../CAM -I$(srcdir)/../STD -I$(srcdir)/../OCCViewer \ - -I$(srcdir)/../Prs -I$(srcdir)/../VTKViewer -I$(srcdir)/../SPlot2d \ - -I$(srcdir)/../Plot2d \ +lib_LTLIBRARIES = _libSALOME_Swig.la +_libSALOME_Swig_la_SOURCES = $(SWIG_SOURCES) SALOMEGUI_Swig.cxx +nodist__libSALOME_Swig_la_SOURCES = swig_wrap.cpp +salomeinclude_HEADERS = $(SWIG_SOURCES) SALOMEGUI_Swig.hxx SALOMEGUI_Swig.i + +_libSALOME_Swig_la_CPPFLAGS = \ + $(QT_INCLUDES) $(QWT_INCLUDES) $(PYTHON_INCLUDES) $(CAS_CPPFLAGS) $(VTK_INCLUDES) \ + $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ \ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ + -I$(srcdir)/../SalomeApp -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT \ + -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LightApp -I$(srcdir)/../SOCC \ + -I$(srcdir)/../SVTK -I$(srcdir)/../Event -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../CAM -I$(srcdir)/../STD -I$(srcdir)/../OCCViewer \ + -I$(srcdir)/../Prs -I$(srcdir)/../VTKViewer -I$(srcdir)/../SPlot2d \ + -I$(srcdir)/../Plot2d \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -libSALOME_Swigcmodule_la_LDFLAGS = -module -libSALOME_Swigcmodule_la_LIBADD = \ - ../SalomeApp/libSalomeApp.la \ +_libSALOME_Swig_la_LDFLAGS = -module +_libSALOME_Swig_la_LIBADD = \ + ../SalomeApp/libSalomeApp.la \ @PYTHON_LIBS@ swig_wrap.cpp : $(SWIG_SOURCES) $(SWIG) $(SWIG_FLAGS) -o $@ $< -CLEANFILES = swig_wrap.cpp +CLEANFILES = swig_wrap.cpp libSALOME_Swig.py # # =============================================================== @@ -92,25 +89,15 @@ CLEANFILES = swig_wrap.cpp # # Scripts to be installed. -dist_salomescript_DATA= \ - examplevtk1.py \ - test_table.py \ - test_big_table.py \ - test_many_objects.py \ - test_remove_ref.py \ - libSALOME_Swig.py - -nodist_salomescript_DATA= \ - supervisionexample.py \ +dist_salomescript_DATA = \ + examplevtk1.py \ + test_table.py \ + test_big_table.py \ + test_many_objects.py \ + test_remove_ref.py + +nodist_salomescript_DATA = \ + supervisionexample.py \ supervisiongeomexample.py -EXTRA_DIST+= \ - supervisionexample.py.in \ - supervisiongeomexample.py.in - -sharedpkgpython_PYTHON= SALOMEGUI_shared_modules.py - -install-exec-hook: $(libdir)/_libSALOME_Swig.so - -$(libdir)/_libSALOME_Swig.so: - (cd $(libdir); ln -sf libSALOME_Swigcmodule.so _libSALOME_Swig.so;) +sharedpkgpython_PYTHON = SALOMEGUI_shared_modules.py diff --git a/src/SOCC/Makefile.am b/src/SOCC/Makefile.am index e822208e5..4da44acea 100755 --- a/src/SOCC/Makefile.am +++ b/src/SOCC/Makefile.am @@ -23,28 +23,28 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -lib_LTLIBRARIES=libSOCC.la +lib_LTLIBRARIES = libSOCC.la -salomeinclude_HEADERS= \ - SOCC.h \ - SOCC_ViewModel.h \ - SOCC_Prs.h \ +salomeinclude_HEADERS = \ + SOCC.h \ + SOCC_ViewModel.h \ + SOCC_Prs.h \ SOCC_ViewWindow.h -dist_libSOCC_la_SOURCES= \ - SOCC_ViewModel.cxx \ - SOCC_Prs.cxx \ +dist_libSOCC_la_SOURCES = \ + SOCC_ViewModel.cxx \ + SOCC_Prs.cxx \ SOCC_ViewWindow.cxx -MOC_FILES= \ - SOCC_ViewModel_moc.cxx \ +MOC_FILES = \ + SOCC_ViewModel_moc.cxx \ SOCC_ViewWindow_moc.cxx -nodist_libSOCC_la_SOURCES= $(MOC_FILES) +nodist_libSOCC_la_SOURCES = $(MOC_FILES) -libSOCC_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \ - -I$(srcdir)/../OCCViewer -I$(srcdir)/../Qtx +libSOCC_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \ + -I$(srcdir)/../OCCViewer -I$(srcdir)/../Qtx -libSOCC_la_LDFLAGS=$(QT_MT_LIBS) -libSOCC_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \ - ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la +libSOCC_la_LDFLAGS = $(QT_MT_LIBS) +libSOCC_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \ + ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la diff --git a/src/SPlot2d/Makefile.am b/src/SPlot2d/Makefile.am index b06302d36..b2dc3f6a5 100644 --- a/src/SPlot2d/Makefile.am +++ b/src/SPlot2d/Makefile.am @@ -21,28 +21,28 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libSPlot2d.la -salomeinclude_HEADERS = \ - SPlot2d.h \ - SPlot2d_Curve.h \ - SPlot2d_Prs.h \ - SPlot2d_ViewModel.h \ +salomeinclude_HEADERS = \ + SPlot2d.h \ + SPlot2d_Curve.h \ + SPlot2d_Prs.h \ + SPlot2d_ViewModel.h \ SPlot2d_ViewWindow.h -dist_libSPlot2d_la_SOURCES = \ - SPlot2d_Curve.cxx \ - SPlot2d_Prs.cxx \ - SPlot2d_ViewModel.cxx \ +dist_libSPlot2d_la_SOURCES = \ + SPlot2d_Curve.cxx \ + SPlot2d_Prs.cxx \ + SPlot2d_ViewModel.cxx \ SPlot2d_ViewWindow.cxx -MOC_FILES = \ - SPlot2d_ViewModel_moc.cxx \ +MOC_FILES = \ + SPlot2d_ViewModel_moc.cxx \ SPlot2d_ViewWindow_moc.cxx nodist_libSPlot2d_la_SOURCES = $(MOC_FILES) -libSPlot2d_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(QWT_INCLUDES) $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Plot2d -I$(srcdir)/../Prs \ - -I$(srcdir)/../OBJECT -libSPlot2d_la_LDFLAGS=$(QT_MT_LIBS) $(QWT_LIBS) ../SUIT/libsuit.la ../Plot2d/libPlot2d.la ../Prs/libSalomePrs.la +libSPlot2d_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(QWT_INCLUDES) $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Plot2d \ + -I$(srcdir)/../Prs -I$(srcdir)/../OBJECT +libSPlot2d_la_LDFLAGS = $(QT_MT_LIBS) $(QWT_LIBS) ../SUIT/libsuit.la ../Plot2d/libPlot2d.la ../Prs/libSalomePrs.la diff --git a/src/STD/Makefile.am b/src/STD/Makefile.am index 158d7de92..7d803077e 100755 --- a/src/STD/Makefile.am +++ b/src/STD/Makefile.am @@ -25,28 +25,28 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libstd.la -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ STD.h \ STD_Application.h \ STD_MDIDesktop.h \ STD_SDIDesktop.h \ STD_TabDesktop.h -dist_libstd_la_SOURCES= \ +dist_libstd_la_SOURCES = \ STD_Application.cxx \ STD_MDIDesktop.cxx \ STD_SDIDesktop.cxx \ STD_TabDesktop.cxx -MOC_FILES= \ +MOC_FILES = \ STD_Application_moc.cxx \ STD_MDIDesktop_moc.cxx \ STD_SDIDesktop_moc.cxx \ STD_TabDesktop_moc.cxx -nodist_libstd_la_SOURCES= $(MOC_FILES) +nodist_libstd_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA= \ +dist_salomeres_DATA = \ resources/cascade.png \ resources/close.png \ resources/copy.png \ @@ -65,10 +65,10 @@ dist_salomeres_DATA= \ resources/vtile.png \ resources/std.ini -nodist_salomeres_DATA= \ +nodist_salomeres_DATA = \ STD_images.qm \ STD_msg_en.qm -libstd_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -libstd_la_LDFLAGS=$(QT_MT_LIBS) -libstd_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la +libstd_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx +libstd_la_LDFLAGS = $(QT_MT_LIBS) +libstd_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la diff --git a/src/SUIT/Makefile.am b/src/SUIT/Makefile.am index fdbd1c9da..4c5ce056d 100755 --- a/src/SUIT/Makefile.am +++ b/src/SUIT/Makefile.am @@ -25,7 +25,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libsuit.la -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ SUIT.h \ SUIT_Accel.h \ SUIT_ActionOperation.h \ @@ -59,7 +59,7 @@ salomeinclude_HEADERS= \ SUIT_ViewModel.h \ SUIT_ViewWindow.h -dist_libsuit_la_SOURCES= \ +dist_libsuit_la_SOURCES = \ SUIT_Accel.cxx \ SUIT_ActionOperation.cxx \ SUIT_Application.cxx \ @@ -90,7 +90,7 @@ dist_libsuit_la_SOURCES= \ SUIT_ViewModel.cxx \ SUIT_ViewWindow.cxx -MOC_FILES= \ +MOC_FILES = \ SUIT_Accel_moc.cxx \ SUIT_ActionOperation_moc.cxx \ SUIT_Application_moc.cxx \ @@ -111,11 +111,11 @@ MOC_FILES= \ SUIT_ViewModel_moc.cxx \ SUIT_ViewWindow_moc.cxx -nodist_libsuit_la_SOURCES=$(MOC_FILES) +nodist_libsuit_la_SOURCES = $(MOC_FILES) nodist_salomeres_DATA = \ SUIT_msg_en.qm -libsuit_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../Qtx -I$(srcdir)/../ObjBrowser -libsuit_la_LDFLAGS=$(QT_MT_LIBS) -libsuit_la_LIBADD=../Qtx/libqtx.la ../ObjBrowser/libObjBrowser.la +libsuit_la_CPPFLAGS = $(QT_INCLUDES) -I$(srcdir)/../Qtx -I$(srcdir)/../ObjBrowser +libsuit_la_LDFLAGS = $(QT_MT_LIBS) +libsuit_la_LIBADD = ../Qtx/libqtx.la ../ObjBrowser/libObjBrowser.la diff --git a/src/SUITApp/Makefile.am b/src/SUITApp/Makefile.am index 5fcd21897..2f8448a8e 100644 --- a/src/SUITApp/Makefile.am +++ b/src/SUITApp/Makefile.am @@ -25,36 +25,36 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libSUITApp.la -salomeinclude_HEADERS= \ +salomeinclude_HEADERS = \ SUITApp_Application.h -dist_libSUITApp_la_SOURCES= \ +dist_libSUITApp_la_SOURCES = \ SUITApp.cxx \ SUITApp_Application.cxx -MOC_FILES= \ +MOC_FILES = \ SUITApp_Application_moc.cxx -nodist_libSUITApp_la_SOURCES= $(MOC_FILES) +nodist_libSUITApp_la_SOURCES = $(MOC_FILES) -nodist_salomeres_DATA= SUITApp_msg_en.qm +nodist_salomeres_DATA = SUITApp_msg_en.qm -libSUITApp_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) \ - -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -I$(srcdir)/../Style +libSUITApp_la_CPPFLAGS = $(QT_INCLUDES) $(PYTHON_INCLUDES) \ + -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -I$(srcdir)/../Style -libSUITApp_la_LDFLAGS=$(QT_MT_LIBS) -libSUITApp_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeStyle.la +libSUITApp_la_LDFLAGS = $(QT_MT_LIBS) +libSUITApp_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeStyle.la if ENABLE_PYCONSOLE -libSUITApp_la_LDFLAGS+= -Xlinker -export-dynamic $(PYTHON_LIBS) +libSUITApp_la_LDFLAGS += -Xlinker -export-dynamic $(PYTHON_LIBS) endif # Executable -bin_PROGRAMS= SUITApp +bin_PROGRAMS = SUITApp -dist_SUITApp_SOURCES=SUITApp.cxx +dist_SUITApp_SOURCES = SUITApp.cxx -SUITApp_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) \ - -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -I$(srcdir)/../Style +SUITApp_CPPFLAGS = $(QT_INCLUDES) $(PYTHON_INCLUDES) \ + -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -I$(srcdir)/../Style -SUITApp_LDADD= libSUITApp.la ../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeStyle.la +SUITApp_LDADD = libSUITApp.la ../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeStyle.la diff --git a/src/SUPERVGraph/Makefile.am b/src/SUPERVGraph/Makefile.am index 0ed26687b..bc91cfa1c 100755 --- a/src/SUPERVGraph/Makefile.am +++ b/src/SUPERVGraph/Makefile.am @@ -21,33 +21,33 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libSUPERVGraph.la -salomeinclude_HEADERS= \ - SUPERVGraph_ViewFrame.h \ - SUPERVGraph_ViewManager.h \ - SUPERVGraph_ViewModel.h \ +salomeinclude_HEADERS = \ + SUPERVGraph_ViewFrame.h \ + SUPERVGraph_ViewManager.h \ + SUPERVGraph_ViewModel.h \ SUPERVGraph.h -dist_libSUPERVGraph_la_SOURCES= \ - SUPERVGraph.cxx \ - SUPERVGraph_ViewFrame.cxx \ - SUPERVGraph_ViewManager.cxx \ +dist_libSUPERVGraph_la_SOURCES = \ + SUPERVGraph.cxx \ + SUPERVGraph_ViewFrame.cxx \ + SUPERVGraph_ViewManager.cxx \ SUPERVGraph_ViewModel.cxx -MOC_FILES= \ - SUPERVGraph_moc.cxx \ - SUPERVGraph_ViewFrame_moc.cxx \ - SUPERVGraph_ViewManager_moc.cxx \ +MOC_FILES = \ + SUPERVGraph_moc.cxx \ + SUPERVGraph_ViewFrame_moc.cxx \ + SUPERVGraph_ViewManager_moc.cxx \ SUPERVGraph_ViewModel_moc.cxx -nodist_libSUPERVGraph_la_SOURCES= $(MOC_FILES) +nodist_libSUPERVGraph_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA= \ - resources/superv_view_pan.png \ +dist_salomeres_DATA = \ + resources/superv_view_pan.png \ resources/superv_view_reset.png -nodist_salomeres_DATA= \ - SUPERVGraph_images.qm \ +nodist_salomeres_DATA = \ + SUPERVGraph_images.qm \ SUPERVGraph_msg_en.qm -libSUPERVGraph_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -libSUPERVGraph_la_LDFLAGS=$(QT_MT_LIBS) ../SUIT/libsuit.la +libSUPERVGraph_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT +libSUPERVGraph_la_LDFLAGS = $(QT_MT_LIBS) ../SUIT/libsuit.la diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am index 283d63a70..ddfde32f7 100755 --- a/src/SVTK/Makefile.am +++ b/src/SVTK/Makefile.am @@ -25,112 +25,116 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libSVTK.la -salomeinclude_HEADERS= \ - SVTK.h \ - SVTK_Prs.h \ - SVTK_Actor.h \ - SALOME_Actor.h \ - SVTK_RectPicker.h \ - SVTK_DeviceActor.h \ - SVTK_DialogBase.h \ - SVTK_FontWidget.h \ - SVTK_CubeAxesActor2D.h \ - SVTK_Functor.h \ - SVTK_MainWindow.h \ - SVTK_View.h \ - SVTK_ViewManager.h \ - SVTK_ViewModel.h \ - SVTK_ViewWindow.h \ - SVTK_Renderer.h \ - SVTK_InteractorStyle.h \ - SVTK_RenderWindowInteractor.h \ - SVTK_GenericRenderWindowInteractor.h \ - SVTK_Selector.h \ - SVTK_Selection.h \ - SVTK_SelectionEvent.h \ - SVTK_SpaceMouse.h \ - SVTK_Event.h \ - SVTK_ViewModelBase.h \ - SVTK_SetRotationPointDlg.h \ +salomeinclude_HEADERS = \ + SVTK.h \ + SVTK_Prs.h \ + SVTK_Actor.h \ + SALOME_Actor.h \ + SVTK_RectPicker.h \ + SVTK_DeviceActor.h \ + SVTK_DialogBase.h \ + SVTK_FontWidget.h \ + SVTK_CubeAxesActor2D.h \ + SVTK_Functor.h \ + SVTK_MainWindow.h \ + SVTK_View.h \ + SVTK_ViewManager.h \ + SVTK_ViewModel.h \ + SVTK_ViewWindow.h \ + SVTK_Renderer.h \ + SVTK_InteractorStyle.h \ + SVTK_RenderWindowInteractor.h \ + SVTK_GenericRenderWindowInteractor.h \ + SVTK_Selector.h \ + SVTK_Selection.h \ + SVTK_SelectionEvent.h \ + SVTK_SpaceMouse.h \ + SVTK_Event.h \ + SVTK_ViewModelBase.h \ + SVTK_SetRotationPointDlg.h \ SVTK_Extension.h -dist_libSVTK_la_SOURCES= \ - SVTK_Prs.cxx \ - SVTK_Actor.cxx \ - SALOME_Actor.cxx \ - SVTK_RectPicker.cxx \ - SVTK_DeviceActor.cxx \ - SVTK_CubeAxesActor2D.cxx \ - SVTK_NonIsometricDlg.cxx \ - SVTK_UpdateRateDlg.cxx \ - SVTK_CubeAxesDlg.cxx \ - SVTK_DialogBase.cxx \ - SVTK_FontWidget.cxx \ - SVTK_Trihedron.cxx \ - SVTK_MainWindow.cxx \ - SVTK_View.cxx \ - SVTK_ViewManager.cxx \ - SVTK_ViewModel.cxx \ - SVTK_Renderer.cxx \ - SVTK_ViewWindow.cxx \ - SVTK_InteractorStyle.cxx \ - SVTK_RenderWindowInteractor.cxx \ - SVTK_GenericRenderWindowInteractor.cxx \ - SVTK_SpaceMouse.cxx \ - SVTK_Selector.cxx \ - SVTK_SetRotationPointDlg.cxx \ +dist_libSVTK_la_SOURCES = \ + SVTK_Prs.cxx \ + SVTK_Actor.cxx \ + SALOME_Actor.cxx \ + SVTK_RectPicker.cxx \ + SVTK_DeviceActor.cxx \ + SVTK_CubeAxesActor2D.cxx \ + SVTK_NonIsometricDlg.cxx \ + SVTK_UpdateRateDlg.cxx \ + SVTK_CubeAxesDlg.cxx \ + SVTK_DialogBase.cxx \ + SVTK_FontWidget.cxx \ + SVTK_Trihedron.cxx \ + SVTK_MainWindow.cxx \ + SVTK_View.cxx \ + SVTK_ViewManager.cxx \ + SVTK_ViewModel.cxx \ + SVTK_Renderer.cxx \ + SVTK_ViewWindow.cxx \ + SVTK_InteractorStyle.cxx \ + SVTK_RenderWindowInteractor.cxx \ + SVTK_GenericRenderWindowInteractor.cxx \ + SVTK_SpaceMouse.cxx \ + SVTK_Selector.cxx \ + SVTK_SetRotationPointDlg.cxx \ SVTK_Extension.cxx -EXTRA_DIST+= SVTK_SelectorDef.h SVTK_Trihedron.h +# internal headers +EXTRA_DIST += SVTK_SelectorDef.h SVTK_Trihedron.h -MOC_FILES= \ - SVTK_GenericRenderWindowInteractor_moc.cxx \ - SVTK_RenderWindowInteractor_moc.cxx \ - SVTK_NonIsometricDlg_moc.cxx \ - SVTK_UpdateRateDlg_moc.cxx \ - SVTK_CubeAxesDlg_moc.cxx \ - SVTK_FontWidget_moc.cxx \ - SVTK_DialogBase_moc.cxx \ - SVTK_ViewModelBase_moc.cxx \ - SVTK_ViewManager_moc.cxx \ - SVTK_ViewWindow_moc.cxx \ - SVTK_MainWindow_moc.cxx \ - SVTK_ViewModel_moc.cxx \ - SVTK_View_moc.cxx \ +MOC_FILES = \ + SVTK_GenericRenderWindowInteractor_moc.cxx \ + SVTK_RenderWindowInteractor_moc.cxx \ + SVTK_NonIsometricDlg_moc.cxx \ + SVTK_UpdateRateDlg_moc.cxx \ + SVTK_CubeAxesDlg_moc.cxx \ + SVTK_FontWidget_moc.cxx \ + SVTK_DialogBase_moc.cxx \ + SVTK_ViewModelBase_moc.cxx \ + SVTK_ViewManager_moc.cxx \ + SVTK_ViewWindow_moc.cxx \ + SVTK_MainWindow_moc.cxx \ + SVTK_ViewModel_moc.cxx \ + SVTK_View_moc.cxx \ SVTK_SetRotationPointDlg_moc.cxx -nodist_libSVTK_la_SOURCES= $(MOC_FILES) +nodist_libSVTK_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA=\ - resources/vtk_view_graduated_axes.png \ - resources/vtk_view_scaling.png \ - resources/vtk_view_update_rate.png \ +dist_salomeres_DATA = \ + resources/vtk_view_graduated_axes.png \ + resources/vtk_view_scaling.png \ + resources/vtk_view_update_rate.png \ resources/vtk_view_rotation_point.png -nodist_salomeres_DATA= \ - SVTK_msg_en.qm \ +nodist_salomeres_DATA = \ + SVTK_msg_en.qm \ SVTK_images.qm -libSVTK_la_CPPFLAGS= \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \ +libSVTK_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(VTK_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Qtx \ + -I$(srcdir)/../SUIT \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../Prs \ -I$(srcdir)/../VTKViewer -libSVTK_la_LDFLAGS= \ - $(QT_MT_LIBS) \ - $(CAS_KERNEL) $(CAS_VIEWER) \ +libSVTK_la_LDFLAGS = \ + $(QT_MT_LIBS) \ + $(CAS_KERNEL) $(CAS_VIEWER) \ $(VTK_LIBS) $(OGL_LIBS) -libSVTK_la_LIBADD= ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \ - ../Prs/libSalomePrs.la ../VTKViewer/libVTKViewer.la +libSVTK_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \ + ../Prs/libSalomePrs.la ../VTKViewer/libVTKViewer.la # Executable bin_PROGRAMS = SVTK -dist_SVTK_SOURCES= SVTK.cxx +dist_SVTK_SOURCES = SVTK.cxx -SVTK_CPPFLAGS=$(libSVTK_la_CPPFLAGS) -SVTK_LDFLAGS=$(libSVTK_la_LDFLAGS) -SVTK_LDADD=libSVTK.la $(libSVTK_la_LIBADD) +SVTK_CPPFLAGS = $(libSVTK_la_CPPFLAGS) +SVTK_LDFLAGS = $(libSVTK_la_LDFLAGS) +SVTK_LDADD = libSVTK.la $(libSVTK_la_LIBADD) diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am index 8ac9d21fd..33a8c5f4a 100755 --- a/src/SalomeApp/Makefile.am +++ b/src/SalomeApp/Makefile.am @@ -25,90 +25,88 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am if CPPUNIT_IS_OK if GUI_ENABLE_CORBA - SUBDIRS=Test + SUBDIRS = Test endif endif -lib_LTLIBRARIES= libSalomeApp.la +lib_LTLIBRARIES = libSalomeApp.la -salomeinclude_HEADERS= \ - SalomeApp.h \ - SalomeApp_Application.h \ - SalomeApp_DataModel.h \ - SalomeApp_DataObject.h \ - SalomeApp_LoadStudiesDlg.h \ - SalomeApp_Module.h \ - SalomeApp_Study.h \ - SalomeApp_ExceptionHandler.h \ - SalomeApp_EventFilter.h \ - SalomeApp_Tools.h \ - SalomeApp_ImportOperation.h \ - SalomeApp_Filter.h \ - SalomeApp_TypeFilter.h \ - SalomeApp_StudyPropertiesDlg.h \ - SalomeApp_CheckFileDlg.h \ - SalomeApp_VisualState.h \ +salomeinclude_HEADERS = \ + SalomeApp.h \ + SalomeApp_Application.h \ + SalomeApp_DataModel.h \ + SalomeApp_DataObject.h \ + SalomeApp_LoadStudiesDlg.h \ + SalomeApp_Module.h \ + SalomeApp_Study.h \ + SalomeApp_ExceptionHandler.h \ + SalomeApp_EventFilter.h \ + SalomeApp_PyInterp.h \ + SalomeApp_Tools.h \ + SalomeApp_ImportOperation.h \ + SalomeApp_Filter.h \ + SalomeApp_TypeFilter.h \ + SalomeApp_StudyPropertiesDlg.h \ + SalomeApp_CheckFileDlg.h \ + SalomeApp_VisualState.h \ SalomeApp_ExitDlg.h -dist_libSalomeApp_la_SOURCES= \ - SalomeApp_Module.cxx \ - SalomeApp_Application.cxx \ - SalomeApp_DataModel.cxx \ - SalomeApp_DataObject.cxx \ - SalomeApp_LoadStudiesDlg.cxx \ - SalomeApp_Study.cxx \ - SalomeApp_ExceptionHandler.cxx \ - SalomeApp_EventFilter.cxx \ - SalomeApp_PyInterp.cxx \ - SalomeApp_Tools.cxx \ - SalomeApp_ImportOperation.cxx \ - SalomeApp_Filter.cxx \ - SalomeApp_TypeFilter.cxx \ - SalomeApp_StudyPropertiesDlg.cxx \ - SalomeApp_ListView.cxx \ - SalomeApp_CheckFileDlg.cxx \ - SalomeApp_VisualState.cxx \ +dist_libSalomeApp_la_SOURCES = \ + SalomeApp_Module.cxx \ + SalomeApp_Application.cxx \ + SalomeApp_DataModel.cxx \ + SalomeApp_DataObject.cxx \ + SalomeApp_LoadStudiesDlg.cxx \ + SalomeApp_Study.cxx \ + SalomeApp_ExceptionHandler.cxx \ + SalomeApp_EventFilter.cxx \ + SalomeApp_PyInterp.cxx \ + SalomeApp_Tools.cxx \ + SalomeApp_ImportOperation.cxx \ + SalomeApp_Filter.cxx \ + SalomeApp_TypeFilter.cxx \ + SalomeApp_StudyPropertiesDlg.cxx \ + SalomeApp_ListView.cxx \ + SalomeApp_CheckFileDlg.cxx \ + SalomeApp_VisualState.cxx \ SalomeApp_ExitDlg.cxx -MOC_FILES= \ - SalomeApp_Application_moc.cxx \ - SalomeApp_DataModel_moc.cxx \ - SalomeApp_Module_moc.cxx \ - SalomeApp_LoadStudiesDlg_moc.cxx \ - SalomeApp_Study_moc.cxx \ - SalomeApp_StudyPropertiesDlg_moc.cxx \ - SalomeApp_ListView_moc.cxx \ - SalomeApp_CheckFileDlg_moc.cxx \ +MOC_FILES = \ + SalomeApp_Application_moc.cxx \ + SalomeApp_DataModel_moc.cxx \ + SalomeApp_Module_moc.cxx \ + SalomeApp_LoadStudiesDlg_moc.cxx \ + SalomeApp_Study_moc.cxx \ + SalomeApp_StudyPropertiesDlg_moc.cxx \ + SalomeApp_ListView_moc.cxx \ + SalomeApp_CheckFileDlg_moc.cxx \ SalomeApp_ExitDlg_moc.cxx -nodist_libSalomeApp_la_SOURCES= $(MOC_FILES) +nodist_libSalomeApp_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA= \ - resources/SalomeApp.ini \ +dist_salomeres_DATA = \ + resources/SalomeApp.ini \ resources/SalomeApp.xml -nodist_salomeres_DATA= \ - SalomeApp_images.qm \ +nodist_salomeres_DATA = \ + SalomeApp_images.qm \ SalomeApp_msg_en.qm -libSalomeApp_la_CPPFLAGS=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) \ - $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ \ - -I$(srcdir)/../LightApp -I$(srcdir)/../CAM -I$(srcdir)/../Qtx \ - -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../SVTK \ - -I$(srcdir)/../STD -I$(srcdir)/../VTKViewer -I$(srcdir)/../ObjBrowser \ - -I$(srcdir)/../PyConsole -I$(srcdir)/../TOOLSGUI \ - -I$(srcdir)/../PyInterp -I$(srcdir)/../Session -I$(top_builddir)/idl \ - -I$(srcdir)/../Event \ - -I$(srcdir)/../CASCatch \ +libSalomeApp_la_CPPFLAGS = $(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) \ + $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ \ + -I$(srcdir)/../LightApp -I$(srcdir)/../CAM -I$(srcdir)/../Qtx \ + -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../SVTK \ + -I$(srcdir)/../STD -I$(srcdir)/../VTKViewer -I$(srcdir)/../ObjBrowser \ + -I$(srcdir)/../PyConsole -I$(srcdir)/../TOOLSGUI \ + -I$(srcdir)/../PyInterp -I$(srcdir)/../Session -I$(top_builddir)/idl \ + -I$(srcdir)/../Event -I$(srcdir)/../CASCatch \ -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@ -libSalomeApp_la_LDFLAGS=$(PYTHON_LIBS) $(QT_MT_LIBS) -libSalomeApp_la_LIBADD= $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient \ - ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la ../ObjBrowser/libObjBrowser.la \ - ../Prs/libSalomePrs.la ../SPlot2d/libSPlot2d.la ../GLViewer/libGLViewer.la \ - ../OCCViewer/libOCCViewer.la ../VTKViewer/libVTKViewer.la ../OBJECT/libSalomeObject.la \ - ../SVTK/libSVTK.la ../SOCC/libSOCC.la ../PyInterp/libPyInterp.la \ - ../PyConsole/libPyConsole.la ../LogWindow/libLogWindow.la \ - ../LightApp/libLightApp.la ../TOOLSGUI/libToolsGUI.la ../Session/libSalomeSession.la \ +libSalomeApp_la_LDFLAGS = $(PYTHON_LIBS) $(QT_MT_LIBS) +libSalomeApp_la_LIBADD = $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient \ + ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la ../ObjBrowser/libObjBrowser.la \ + ../Prs/libSalomePrs.la ../SPlot2d/libSPlot2d.la ../GLViewer/libGLViewer.la \ + ../OCCViewer/libOCCViewer.la ../VTKViewer/libVTKViewer.la ../OBJECT/libSalomeObject.la \ + ../SVTK/libSVTK.la ../SOCC/libSOCC.la ../PyInterp/libPyInterp.la \ + ../PyConsole/libPyConsole.la ../LogWindow/libLogWindow.la \ + ../LightApp/libLightApp.la ../TOOLSGUI/libToolsGUI.la ../Session/libSalomeSession.la \ ../CASCatch/libCASCatch.la $(CAS_KERNEL) - -EXTRA_DIST+=SalomeApp_PyInterp.h diff --git a/src/SalomeApp/Test/Makefile.am b/src/SalomeApp/Test/Makefile.am index 3971f30d0..7f3293185 100644 --- a/src/SalomeApp/Test/Makefile.am +++ b/src/SalomeApp/Test/Makefile.am @@ -27,21 +27,21 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -lib_LTLIBRARIES= libSalomeAppTest.la +lib_LTLIBRARIES = libSalomeAppTest.la -salomeinclude_HEADERS= SalomeAppTest.hxx +salomeinclude_HEADERS = SalomeAppTest.hxx -dist_libSalomeAppTest_la_SOURCES= SalomeAppTest.cxx +dist_libSalomeAppTest_la_SOURCES = SalomeAppTest.cxx -libSalomeAppTest_la_CXXFLAGS= @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS) -libSalomeAppTest_la_LIBADD= @CPPUNIT_LIBS@ +libSalomeAppTest_la_CXXFLAGS = @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS) +libSalomeAppTest_la_LIBADD = @CPPUNIT_LIBS@ -bin_PROGRAMS= TestSalomeApp +bin_PROGRAMS = TestSalomeApp -TestSalomeApp_SOURCES= TestSalomeApp.cxx +TestSalomeApp_SOURCES = TestSalomeApp.cxx -TestSalomeApp_CXXFLAGS= $(libSalomeAppTest_la_CXXFLAGS) -TestSalomeApp_LDADD= $(libSalomeAppTest_la_LIBADD) libSalomeAppTest.la +TestSalomeApp_CXXFLAGS = $(libSalomeAppTest_la_CXXFLAGS) +TestSalomeApp_LDADD = $(libSalomeAppTest_la_LIBADD) libSalomeAppTest.la dist_salomescript_PYTHON = TestSalomeApp.py UNIT_TEST_PROG = TestSalomeApp diff --git a/src/Session/Makefile.am b/src/Session/Makefile.am index 6de26cbfa..b6b196500 100755 --- a/src/Session/Makefile.am +++ b/src/Session/Makefile.am @@ -30,49 +30,45 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libSalomeSession.la -salomeinclude_HEADERS= \ - Session_Session_i.hxx \ - Session_ServerLauncher.hxx \ - Session_ServerThread.hxx \ - Session_ServerCheck.hxx \ +salomeinclude_HEADERS = \ + Session_Session_i.hxx \ + SALOME_Session.hxx \ + Session_ServerLauncher.hxx \ + Session_ServerThread.hxx \ + Session_ServerCheck.hxx \ SalomeApp_Engine_i.hxx # Libraries targets -dist_libSalomeSession_la_SOURCES= \ - Session_Session_i.cxx \ - Session_ServerThread.cxx \ - Session_ServerLauncher.cxx \ - Session_ServerCheck.cxx \ +dist_libSalomeSession_la_SOURCES = \ + Session_Session_i.cxx \ + Session_ServerThread.cxx \ + Session_ServerLauncher.cxx \ + Session_ServerCheck.cxx \ SalomeApp_Engine_i.cxx -libSalomeSession_la_CPPFLAGS= $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) \ - $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ $(CAS_CPPFLAGS) \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ - -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ - -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Event \ +libSalomeSession_la_CPPFLAGS = $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) \ + $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ $(CAS_CPPFLAGS) \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Event \ -I$(srcdir)/../Style @LIBXML_INCLUDES@ -libSalomeSession_la_LDFLAGS= $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS \ - -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSalomeCatalog \ - -lSalomeDSClient $(CAS_KERNEL) -lwith_loggerTraceCollector \ - ../SUIT/libsuit.la ../Event/libEvent.la ../../idl/libSalomeIDLGUI.la \ +libSalomeSession_la_LDFLAGS = $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS \ + -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSalomeCatalog \ + -lSalomeDSClient $(CAS_KERNEL) -lwith_loggerTraceCollector \ + ../SUIT/libsuit.la ../Event/libEvent.la ../../idl/libSalomeIDLGUI.la \ ../Style/libSalomeStyle.la # Executable -bin_PROGRAMS= SALOME_Session_Server +bin_PROGRAMS = SALOME_Session_Server -dist_SALOME_Session_Server_SOURCES= SALOME_Session_Server.cxx +dist_SALOME_Session_Server_SOURCES = SALOME_Session_Server.cxx -SALOME_Session_Server_CPPFLAGS= $(libSalomeSession_la_CPPFLAGS) -SALOME_Session_Server_LDADD= $(libSalomeSession_la_LDFLAGS) $(OMNIORB_LIBS) \ - $(HDF5_LIBS) -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS \ - -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry \ - -lSalomeNotification -lSALOMEBasics -lSalomeLauncher ../Qtx/libqtx.la \ - $(top_builddir)/idl/libSalomeIDLGUI.la \ +SALOME_Session_Server_CPPFLAGS = $(libSalomeSession_la_CPPFLAGS) +SALOME_Session_Server_LDADD = $(libSalomeSession_la_LDFLAGS) $(OMNIORB_LIBS) \ + $(HDF5_LIBS) -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS \ + -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry \ + -lSalomeNotification -lSALOMEBasics -lSalomeLauncher ../Qtx/libqtx.la \ + $(top_builddir)/idl/libSalomeIDLGUI.la \ libSalomeSession.la - -lib-hook: - ln -sf $(top_builddir)/bin/salome/styles styles - -# ../SalomeApp/libSalomeApp.la diff --git a/src/Style/Makefile.am b/src/Style/Makefile.am index 518ff8d09..9c1ffedde 100644 --- a/src/Style/Makefile.am +++ b/src/Style/Makefile.am @@ -22,30 +22,32 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am +EXTRA_DIST += images + # Libraries targets lib_LTLIBRARIES = libSalomeStyle.la -salomeinclude_HEADERS= \ - Style.h \ - Style_Tools.h \ - Style_Model.h \ +salomeinclude_HEADERS = \ + Style.h \ + Style_Tools.h \ + Style_Model.h \ Style_Salome.h -dist_libSalomeStyle_la_SOURCES= \ - Style_Tools.cxx \ - Style_Model.cxx \ +dist_libSalomeStyle_la_SOURCES = \ + Style_Tools.cxx \ + Style_Model.cxx \ Style_Salome.cxx -MOC_FILES= \ +MOC_FILES = \ Style_Salome_moc.cxx -QRC_FILES= \ +QRC_FILES = \ qrc_Style.cxx -nodist_libSalomeStyle_la_SOURCES= $(MOC_FILES) $(QRC_FILES) +nodist_libSalomeStyle_la_SOURCES = $(MOC_FILES) $(QRC_FILES) -libSalomeStyle_la_CPPFLAGS=$(QT_INCLUDES) \ +libSalomeStyle_la_CPPFLAGS = $(QT_INCLUDES) \ -I$(srcdir)/../Qtx -libSalomeStyle_la_LDFLAGS=$(QT_MT_LIBS) \ +libSalomeStyle_la_LDFLAGS = $(QT_MT_LIBS) \ ../Qtx/libqtx.la diff --git a/src/TOOLSGUI/Makefile.am b/src/TOOLSGUI/Makefile.am index d972dfa13..531e55942 100755 --- a/src/TOOLSGUI/Makefile.am +++ b/src/TOOLSGUI/Makefile.am @@ -30,31 +30,29 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libToolsGUI.la -salomeinclude_HEADERS= \ - ToolsGUI.h \ - ToolsGUI_RegWidget.h \ +salomeinclude_HEADERS = \ + ToolsGUI.h \ + ToolsGUI_RegWidget.h \ ToolsGUI_CatalogGeneratorDlg.h -dist_libToolsGUI_la_SOURCES= \ - ToolsGUI_CatalogGeneratorDlg.cxx \ - ToolsGUI_RegWidget.cxx \ +dist_libToolsGUI_la_SOURCES = \ + ToolsGUI_CatalogGeneratorDlg.cxx \ + ToolsGUI_RegWidget.cxx \ ToolsGUI.cxx -EXTRA_DIST+= - -MOC_FILES= \ - ToolsGUI_CatalogGeneratorDlg_moc.cxx \ +MOC_FILES = \ + ToolsGUI_CatalogGeneratorDlg_moc.cxx \ ToolsGUI_RegWidget_moc.cxx -nodist_libToolsGUI_la_SOURCES= $(MOC_FILES) +nodist_libToolsGUI_la_SOURCES = $(MOC_FILES) # .po files to transform in .qm -nodist_salomeres_DATA= \ +nodist_salomeres_DATA = \ ToolsGUI_msg_en.qm -libToolsGUI_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \ - @KERNEL_CXXFLAGS@ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ - -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ +libToolsGUI_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \ + @KERNEL_CXXFLAGS@ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -libToolsGUI_la_LDFLAGS = $(QT_MT_LIBS) ../SUIT/libsuit.la $(CAS_KERNEL) $(KERNEL_LDFLAGS) \ +libToolsGUI_la_LDFLAGS = $(QT_MT_LIBS) ../SUIT/libsuit.la $(CAS_KERNEL) $(KERNEL_LDFLAGS) \ -lSalomeNS -lOpUtil $(top_builddir)/idl/libSalomeIDLGUI.so diff --git a/src/VTKViewer/Makefile.am b/src/VTKViewer/Makefile.am index 1d32bce34..2454631e7 100755 --- a/src/VTKViewer/Makefile.am +++ b/src/VTKViewer/Makefile.am @@ -25,89 +25,89 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am lib_LTLIBRARIES = libVTKViewer.la -salomeinclude_HEADERS= \ - VTKViewer.h \ - VTKViewer_CellLocationsArray.h \ - VTKViewer_Actor.h \ - VTKViewer_ExtractUnstructuredGrid.h \ - VTKViewer_ConvexTool.h \ - VTKViewer_Filter.h \ - VTKViewer_GeometryFilter.h \ - VTKViewer_AppendFilter.h \ - VTKViewer_Algorithm.h \ - VTKViewer_InteractorStyle.h \ - VTKViewer_RenderWindow.h \ - VTKViewer_RenderWindowInteractor.h \ - VTKViewer_ShrinkFilter.h \ - VTKViewer_TransformFilter.h \ - VTKViewer_Transform.h \ - VTKViewer_Trihedron.h \ - VTKViewer_Utilities.h \ - VTKViewer_ViewManager.h \ - VTKViewer_ViewModel.h \ - VTKViewer_ViewWindow.h \ +salomeinclude_HEADERS = \ + VTKViewer.h \ + VTKViewer_CellLocationsArray.h \ + VTKViewer_Actor.h \ + VTKViewer_ExtractUnstructuredGrid.h \ + VTKViewer_ConvexTool.h \ + VTKViewer_Filter.h \ + VTKViewer_GeometryFilter.h \ + VTKViewer_AppendFilter.h \ + VTKViewer_Algorithm.h \ + VTKViewer_InteractorStyle.h \ + VTKViewer_RenderWindow.h \ + VTKViewer_RenderWindowInteractor.h \ + VTKViewer_ShrinkFilter.h \ + VTKViewer_TransformFilter.h \ + VTKViewer_Transform.h \ + VTKViewer_Trihedron.h \ + VTKViewer_Utilities.h \ + VTKViewer_ViewManager.h \ + VTKViewer_ViewModel.h \ + VTKViewer_ViewWindow.h \ VTKViewer_Functor.h -dist_libVTKViewer_la_SOURCES= \ - VTKViewer_CellLocationsArray.cxx \ - VTKViewer_Actor.cxx \ - VTKViewer_ExtractUnstructuredGrid.cxx \ - VTKViewer_Filter.cxx \ - VTKViewer_GeometryFilter.cxx \ - VTKViewer_AppendFilter.cxx \ - VTKViewer_InteractorStyle.cxx \ - VTKViewer_RenderWindow.cxx \ - VTKViewer_RenderWindowInteractor.cxx \ - VTKViewer_ShrinkFilter.cxx \ - VTKViewer_Transform.cxx \ - VTKViewer_TransformFilter.cxx \ - VTKViewer_Trihedron.cxx \ - VTKViewer_Utilities.cxx \ - VTKViewer_ViewManager.cxx \ - VTKViewer_ViewModel.cxx \ - VTKViewer_ConvexTool.cxx \ +dist_libVTKViewer_la_SOURCES = \ + VTKViewer_CellLocationsArray.cxx \ + VTKViewer_Actor.cxx \ + VTKViewer_ExtractUnstructuredGrid.cxx \ + VTKViewer_Filter.cxx \ + VTKViewer_GeometryFilter.cxx \ + VTKViewer_AppendFilter.cxx \ + VTKViewer_InteractorStyle.cxx \ + VTKViewer_RenderWindow.cxx \ + VTKViewer_RenderWindowInteractor.cxx \ + VTKViewer_ShrinkFilter.cxx \ + VTKViewer_Transform.cxx \ + VTKViewer_TransformFilter.cxx \ + VTKViewer_Trihedron.cxx \ + VTKViewer_Utilities.cxx \ + VTKViewer_ViewManager.cxx \ + VTKViewer_ViewModel.cxx \ + VTKViewer_ConvexTool.cxx \ VTKViewer_ViewWindow.cxx -MOC_FILES= \ - VTKViewer_RenderWindow_moc.cxx \ - VTKViewer_RenderWindowInteractor_moc.cxx \ - VTKViewer_ViewManager_moc.cxx \ - VTKViewer_ViewModel_moc.cxx \ +MOC_FILES = \ + VTKViewer_RenderWindow_moc.cxx \ + VTKViewer_RenderWindowInteractor_moc.cxx \ + VTKViewer_ViewManager_moc.cxx \ + VTKViewer_ViewModel_moc.cxx \ VTKViewer_ViewWindow_moc.cxx -nodist_libVTKViewer_la_SOURCES= $(MOC_FILES) +nodist_libVTKViewer_la_SOURCES = $(MOC_FILES) -dist_salomeres_DATA=\ - resources/vtk_view_back.png \ - resources/vtk_view_bottom.png \ - resources/vtk_view_camera_dump.png \ - resources/vtk_view_fitall.png \ - resources/vtk_view_fitarea.png \ - resources/vtk_view_front.png \ - resources/vtk_view_glpan.png \ - resources/vtk_view_left.png \ - resources/vtk_view_pan.png \ - resources/vtk_view_reset.png \ - resources/vtk_view_right.png \ - resources/vtk_view_rotate.png \ - resources/vtk_view_top.png \ - resources/vtk_view_triedre.png \ +dist_salomeres_DATA = \ + resources/vtk_view_back.png \ + resources/vtk_view_bottom.png \ + resources/vtk_view_camera_dump.png \ + resources/vtk_view_fitall.png \ + resources/vtk_view_fitarea.png \ + resources/vtk_view_front.png \ + resources/vtk_view_glpan.png \ + resources/vtk_view_left.png \ + resources/vtk_view_pan.png \ + resources/vtk_view_reset.png \ + resources/vtk_view_right.png \ + resources/vtk_view_rotate.png \ + resources/vtk_view_top.png \ + resources/vtk_view_triedre.png \ resources/vtk_view_zoom.png -nodist_salomeres_DATA= \ - VTKViewer_images.qm \ +nodist_salomeres_DATA = \ + VTKViewer_images.qm \ VTKViewer_msg_en.qm -libVTKViewer_la_CPPFLAGS=$(QT_INCLUDES) $(VTK_INCLUDES) $(CAS_CPPFLAGS) \ +libVTKViewer_la_CPPFLAGS = $(QT_INCLUDES) $(VTK_INCLUDES) $(CAS_CPPFLAGS) \ -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -libVTKViewer_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_KERNEL) $(VTK_LIBS) $(OGL_LIBS) \ +libVTKViewer_la_LDFLAGS = $(QT_MT_LIBS) $(CAS_KERNEL) $(VTK_LIBS) $(OGL_LIBS) \ ../Qtx/libqtx.la ../SUIT/libsuit.la # Executable bin_PROGRAMS = VTKViewer -dist_VTKViewer_SOURCES=VTKViewer.cxx +dist_VTKViewer_SOURCES = VTKViewer.cxx -VTKViewer_CPPFLAGS=$(libVTKViewer_la_CPPFLAGS) -VTKViewer_LDADD=libVTKViewer.la $(libVTKViewer_la_LDFLAGS) +VTKViewer_CPPFLAGS = $(libVTKViewer_la_CPPFLAGS) +VTKViewer_LDADD = libVTKViewer.la $(libVTKViewer_la_LDFLAGS) -- 2.39.2