]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
Fix problems of make distcheck
authorvsr <vsr@opencascade.com>
Thu, 10 Nov 2011 08:05:05 +0000 (08:05 +0000)
committervsr <vsr@opencascade.com>
Thu, 10 Nov 2011 08:05:05 +0000 (08:05 +0000)
doc/salome/gui/SMESH/doxyfile.in
doc/salome/tui/Makefile.am
src/MEFISTO2/Makefile.am
src/Tools/Makefile.am
src/Tools/padder/Makefile.am
src/Tools/padder/doc/Makefile.am
src/Tools/padder/meshjob/impl/Makefile.am
src/Tools/padder/resources/Makefile.am
src/Tools/padder/resources/appligen/Makefile.am
src/Tools/padder/resources/padderexe/Makefile.am
src/Tools/padder/spadderpy/gui/Makefile.am

index aec3397c21c0a1bc0feac8be8f44e13378c69c30..b303e848785979eda4c6567379f94d8e149877b6 100755 (executable)
@@ -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
 
 #---------------------------------------------------------------------------
index d5e3e13ee4b0409cbab2074819cf3c1d1f895260..e35ac049b1f34c2a873f76d1270417f3410825df 100644 (file)
@@ -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
index 846e441c9396efc05067566c7f925af019d9751b..1e02043bf6b08e091c7dbe3f40f3ff99a582b626 100644 (file)
@@ -51,3 +51,6 @@ libMEFISTO2D_la_LDFLAGS = \
 #libMEFISTO2D_la_LDFLAGS += -lg2c
 #endif
 
+OBSOLETE_FILES = areteideale.f
+
+EXTRA_DIST += $(OBSOLETE_FILES)
index 8191cf8a9b37233042a01da4fa374fe5f73cdd15..96b92e3cf60bcf3fe50a9e94ea33391371f35e99 100644 (file)
@@ -26,6 +26,3 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 SUBDIRS = MeshCut padder
-#SUBDIRS = MeshCut
-
-DIST_SUBDIRS =         MeshCut
index 9cf8a0a4e59aa6a88d9fd94d531f13131d391f27..6f1623464b6ae887c795f7596de5a1bbd7b2acf2 100644 (file)
@@ -1 +1,3 @@
 SUBDIRS = meshjob spadderpy unittests resources doc
+
+EXTRA_DIST = README.txt
index d5c4468f01a19a2821cab207a9b3a5b822135dbe..3cd551685f8e288acef46c8998b1c06a9e8faad3 100755 (executable)
@@ -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  
 #
index 67986d05ea174c46f0a4ef2e58141a199c575054..336d1629b7cd83807cb8019aa30f3d5d75fe5c4b 100644 (file)
@@ -34,6 +34,7 @@ libMeshJobManagerEngine_la_LDFLAGS   = \
 lib_LTLIBRARIES += libSPADDERPluginTesterEngine.la
 
 libSPADDERPluginTesterEngine_la_SOURCES  = \
+       SPADDERPluginTester_i.hxx \
         SPADDERPluginTester_i.cxx
 
 nodist_libSPADDERPluginTesterEngine_la_SOURCES =
index a65b30ae5e7cb29cd3638889106efb730b3fb453..b17082ea88fe1d701c9b0d759b62c0e46548d308 100644 (file)
@@ -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
index d0e202e53e3e144f616599bbafa27a0eb7da5cf4..91f408ce97337e44d9be118e0eb7878de6dc50e6 100644 (file)
@@ -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
index 6833e085f0ed27f315447491357d51319e8e132d..f3e8d9c4d1019e1cee56c089d7e6c44ae36af7cf 100644 (file)
@@ -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)
index 99514f1be4bcd3231c6dab51a8b84f6f4a4842fa..9187c7ec422a4ac0ee5d3fcd8b73c188411485c7 100644 (file)
@@ -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)