From cfea6a12fdc40e0d7f37d677c87d1851ca724edf Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 10 Nov 2011 08:05:05 +0000 Subject: [PATCH 1/1] Fix problems of make distcheck --- doc/salome/gui/SMESH/doxyfile.in | 4 +- doc/salome/tui/Makefile.am | 2 +- src/MEFISTO2/Makefile.am | 3 + src/Tools/Makefile.am | 3 - src/Tools/padder/Makefile.am | 2 + src/Tools/padder/doc/Makefile.am | 59 +------------------ src/Tools/padder/meshjob/impl/Makefile.am | 1 + src/Tools/padder/resources/Makefile.am | 2 +- .../padder/resources/appligen/Makefile.am | 16 ++--- .../padder/resources/padderexe/Makefile.am | 12 +++- src/Tools/padder/spadderpy/gui/Makefile.am | 15 +++-- 11 files changed, 42 insertions(+), 77 deletions(-) diff --git a/doc/salome/gui/SMESH/doxyfile.in b/doc/salome/gui/SMESH/doxyfile.in index aec3397c2..b303e8487 100755 --- a/doc/salome/gui/SMESH/doxyfile.in +++ b/doc/salome/gui/SMESH/doxyfile.in @@ -38,10 +38,10 @@ WARNINGS = YES #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = @srcdir@/input +INPUT = @srcdir@/input @top_srcdir@/src/Tools/padder/doc/input FILE_PATTERNS = *.doc EXCLUDE = -IMAGE_PATH = @srcdir@/images +IMAGE_PATH = @srcdir@/images @top_srcdir@/src/Tools/padder/doc/images EXAMPLE_PATH = @top_srcdir@/src/SMESH_SWIG #--------------------------------------------------------------------------- diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index d5e3e13ee..e35ac049b 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -23,7 +23,7 @@ # include $(top_srcdir)/adm_local/unix/make_common_starter.am -EXTRA_DIST += images static/doxygen.css static/footer.html +EXTRA_DIST += input images static/doxygen.css static/footer.html tuidocdir = $(docdir)/tui/SMESH tuidoc_DATA = images/head.png images/smeshscreen.png diff --git a/src/MEFISTO2/Makefile.am b/src/MEFISTO2/Makefile.am index 846e441c9..1e02043bf 100644 --- a/src/MEFISTO2/Makefile.am +++ b/src/MEFISTO2/Makefile.am @@ -51,3 +51,6 @@ libMEFISTO2D_la_LDFLAGS = \ #libMEFISTO2D_la_LDFLAGS += -lg2c #endif +OBSOLETE_FILES = areteideale.f + +EXTRA_DIST += $(OBSOLETE_FILES) diff --git a/src/Tools/Makefile.am b/src/Tools/Makefile.am index 8191cf8a9..96b92e3cf 100644 --- a/src/Tools/Makefile.am +++ b/src/Tools/Makefile.am @@ -26,6 +26,3 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = MeshCut padder -#SUBDIRS = MeshCut - -DIST_SUBDIRS = MeshCut diff --git a/src/Tools/padder/Makefile.am b/src/Tools/padder/Makefile.am index 9cf8a0a4e..6f1623464 100644 --- a/src/Tools/padder/Makefile.am +++ b/src/Tools/padder/Makefile.am @@ -1 +1,3 @@ SUBDIRS = meshjob spadderpy unittests resources doc + +EXTRA_DIST = README.txt diff --git a/src/Tools/padder/doc/Makefile.am b/src/Tools/padder/doc/Makefile.am index d5c4468f0..3cd551685 100755 --- a/src/Tools/padder/doc/Makefile.am +++ b/src/Tools/padder/doc/Makefile.am @@ -24,64 +24,11 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am EXTRA_DIST += images input # -# The simplest way to extends the documentation of SMESH with the -# documentation for PADDER is to copy the local source files (*.doc -# and *.png) in the source directory of SMESH documentation. Theses -# pages will be automagically included in the SMESH documentation -# generating process (make usr_docs executed at installation step) and -# will be inserted in the page pages.html that lists the "Related -# pages". +# The simplest way to extend the documentation of SMESH with the +# documentation for PADDER is to add path to the padder documentation +# in the SMESH gui documentation # -DOC_FILES = \ - padder_userguide.doc - -DOCDIR=$(top_srcdir)/doc/salome/gui/SMESH/input - -IMG_FILES = \ - SMESH_spadder_end.png \ - SMESH_spadder_inputdialog_concrete.png \ - SMESH_spadder_inputdialog_start.png \ - SMESH_spadder_inputdialog_steelbar.png \ - SMESH_spadder_menu.png \ - SMESH_spadder_plugindialog_compute_finished.png \ - SMESH_spadder_plugindialog_compute_ready.png \ - SMESH_spadder_plugindialog_compute_running.png \ - SMESH_spadder_plugindialog_published.png \ - SMESH_spadder_plugindialog_start.png \ - SMESH_spadder_start.png - - -IMGDIR=$(top_srcdir)/doc/salome/gui/SMESH/images - - -all: - @mkdir -p $(DOCDIR); \ - for docfile in $(DOC_FILES); do \ - if [ ! -h $(DOCDIR)/$${docfile} ]; then \ - echo "Linking file $${docfile} to $(DOCDIR)/$${docfile}"; \ - ln -s ../$(srcdir)/input/$${docfile} $(DOCDIR)/$${docfile}; \ - fi; \ - done; \ - for imgfile in $(IMG_FILES); do \ - if [ ! -h $(IMGDIR)/$${imgfile} ]; then \ - echo "Linking file $${imgfile} to $(IMGDIR)/$${imgfile}"; \ - ln -s ../$(srcdir)/images/$${imgfile} $(IMGDIR)/$${imgfile}; \ - fi; \ - done; - -clean-local: - @ls | grep -v -e Makefile -e doxyfile | xargs rm -rf; \ - for docfile in $(DOC_FILES); do \ - echo "Removing file $${docfile} from $(DOCDIR)"; \ - rm $(DOCDIR)/$${docfile}; \ - done; \ - for imgfile in $(IMG_FILES); do \ - echo "Removing file $${imgfile} from $(IMGDIR)"; \ - rm $(IMGDIR)/$${imgfile}; \ - done; - -# # For test purpose, we let the user generate a local dosygen # documentation including only the local pages # diff --git a/src/Tools/padder/meshjob/impl/Makefile.am b/src/Tools/padder/meshjob/impl/Makefile.am index 67986d05e..336d1629b 100644 --- a/src/Tools/padder/meshjob/impl/Makefile.am +++ b/src/Tools/padder/meshjob/impl/Makefile.am @@ -34,6 +34,7 @@ libMeshJobManagerEngine_la_LDFLAGS = \ lib_LTLIBRARIES += libSPADDERPluginTesterEngine.la libSPADDERPluginTesterEngine_la_SOURCES = \ + SPADDERPluginTester_i.hxx \ SPADDERPluginTester_i.cxx nodist_libSPADDERPluginTesterEngine_la_SOURCES = diff --git a/src/Tools/padder/resources/Makefile.am b/src/Tools/padder/resources/Makefile.am index a65b30ae5..b17082ea8 100644 --- a/src/Tools/padder/resources/Makefile.am +++ b/src/Tools/padder/resources/Makefile.am @@ -4,4 +4,4 @@ SUBDIRS = appligen padderexe include $(top_srcdir)/adm_local/unix/make_common_starter.am mysalomeresdir=$(salomeresdir) -mysalomeres_DATA = SPADDERCatalog.xml +dist_mysalomeres_DATA = SPADDERCatalog.xml diff --git a/src/Tools/padder/resources/appligen/Makefile.am b/src/Tools/padder/resources/appligen/Makefile.am index d0e202e53..91f408ce9 100644 --- a/src/Tools/padder/resources/appligen/Makefile.am +++ b/src/Tools/padder/resources/appligen/Makefile.am @@ -20,18 +20,20 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am appligendir = $(salomeresdir)/appligen -appligen_DATA= \ - envappli.sh \ - config_appli.xml \ +dist_appligen_DATA= \ appli-splashscreen.jpg \ SalomeApp.xml \ CatalogResources.xml -appligen_SCRIPTS= \ - appligen.sh - -EXTRA_DIST += $(appligen_DATA) $(appligen_SCRIPTS) +nodist_appligen_DATA= \ + envappli.sh \ + config_appli.xml +nodist_appligen_SCRIPTS= \ + appligen.sh envappli.sh: $(srcdir)/genenv.sh envappli.sh + +EXTRA_DIST += README.txt genenv.sh +CLEANFILES = envappli.sh diff --git a/src/Tools/padder/resources/padderexe/Makefile.am b/src/Tools/padder/resources/padderexe/Makefile.am index 6833e085f..f3e8d9c4d 100644 --- a/src/Tools/padder/resources/padderexe/Makefile.am +++ b/src/Tools/padder/resources/padderexe/Makefile.am @@ -24,15 +24,21 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am mysalomeresdir=$(salomeresdir)/padderexe version=med3 +notinstall_version=med2 # We install the padder.exe program and the files required for testing # the execution from within the installation directory -mysalomeres_SCRIPTS = \ +dist_mysalomeres_SCRIPTS = \ $(version)/padder.exe \ - envPadder.sh \ padder.sh -mysalomeres_DATA = \ +nodist_mysalomeres_SCRIPTS = \ + envPadder.sh + +dist_mysalomeres_DATA = \ $(version)/data.txt \ $(version)/concrete.med \ $(version)/ferraill.med + +NOT_USED_FILES = buildparticules.py particules.png +EXTRA_DIST += $(notinstall_version) $(NOT_USED_FILES) diff --git a/src/Tools/padder/spadderpy/gui/Makefile.am b/src/Tools/padder/spadderpy/gui/Makefile.am index 99514f1be..9187c7ec4 100644 --- a/src/Tools/padder/spadderpy/gui/Makefile.am +++ b/src/Tools/padder/spadderpy/gui/Makefile.am @@ -6,15 +6,20 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # sub-package plugins. # spadderpydir=$(smeshpypkgdir)/spadder/gui -spadderpy_PYTHON = \ +dist_spadderpy_PYTHON = \ __init__.py \ - plugindialog_ui.py \ plugindialog.py \ - inputframe_ui.py \ inputdialog.py \ inputdata.py -spadderpy_DATA= \ +PYUIC_FILES = \ + plugindialog_ui.py \ + inputframe_ui.py + +nodist_spadderpy_PYTHON = $(PYUIC_FILES) +CLEANFILES = $(PYUIC_FILES) + +dist_spadderpy_DATA= \ parameters.png \ input.png \ select.png \ @@ -34,3 +39,5 @@ PYUIC = @PYUIC@ PYRCC = @PYRCC@ %_rc.py:%.qrc $(PYRCC) $< -o $@ + +EXTRA_DIST += $(PYUIC_FILES:%_ui.py=%.ui) -- 2.30.2