Implement 'make dist' and 'make distcheck' steps support

diff --git a/Makefile.am b/Makefile.am
index 00c1a609242f319a27faac962bfd79cec86648cf..59395ae46e2a332a9dc5299c301ec6638d141875 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,15 +26,32 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if NETGENPLUGIN_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+                    -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+else !NETGENPLUGIN_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
+endif
+
 SUBDIRS = idl adm_local resources src bin
 
 DIST_SUBDIRS = idl adm_local resources src bin 
 
 DISTCLEANFILES = a.out aclocal.m4 configure
 
-salomeinclude_DATA=NETGENPLUGIN_version.h
+salomeinclude_DATA = NETGENPLUGIN_version.h
 
-EXTRA_DIST+= \
+EXTRA_DIST += \
        build_configure \
-       clean_configure \
-       LICENCE
+       clean_configure
+
+dist-hook:
+       rm -rf `find $(distdir) -name CVS`

diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 7ae83a6fc82f9b81116b259ad29f7610ead06353..b2d96e987677f1ed3625a5761229d90256626bc2 100644 (file)
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -16,4 +16,7 @@
 # 
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 # 
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = unix

diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am
index 2277a685333a98b7a890316b83430447076f8631..2772957dee53cd290e72c00aa47b5402a8b5a627 100644 (file)
--- a/adm_local/unix/config_files/Makefile.am
+++ b/adm_local/unix/config_files/Makefile.am
@@ -16,8 +16,9 @@
 # 
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 # 
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-dist_admlocalm4_DATA= \
-       check_NETGEN.m4 \
+dist_admlocalm4_DATA =         \
+       check_NETGEN.m4         \
        check_NETGENPLUGIN.m4

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index c6e076e41b406d1200039f328ffdfe553e860742..c8f973454a3a3d9a780d419d30bc0a8479a4e653 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -7,43 +7,58 @@
 #
 
 # 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: %.ts
        $(LRELEASE) $< -qm $@
 
-EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.ts)
+# resource files generation (qrcc)
+qrc_%.cxx: %.qrc
+       $(QRCC) $< -o $@ -name $(*F)
 
+# qt forms files generation (uic)
+ui_%.h: %.ui
+       $(UIC) -o $@ $<
+
+# extra distributed files
+EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \
+             $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts)
+
+# customize clean operation
 mostlyclean-local:
        rm -f @builddir@/*_moc.cxx
        rm -f @builddir@/*.qm
+       rm -f @builddir@/ui_*.h
+       rm -f @builddir@/qrc_*.cxx
 
 # tests
 tests: unittest

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 4fdbc5386faa8260237ca40aa7eee31b706266a0..69e0d67d9374744480266b64f7309f4e1d665bd9 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -24,13 +24,8 @@
 
 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
+# non-distributed files 
+nodist_salomescript_DATA = VERSION
 
-EXTRA_DIST+= VERSION.in
+# distributed files
+dist_salomescript_SCRIPTS =

diff --git a/clean_configure b/clean_configure
new file mode 100755 (executable)
index 0000000..be0b542
--- /dev/null
+++ b/clean_configure
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+rm -rf autom4te.cache aclocal.m4 configure make_config
+find . -name "*~" -print -exec rm {} \;
+find . -name "*.pyc" -print -exec rm {} \;
+#exit
+# ==================== ON SORT AVANT
+
+find bin -name Makefile.in | xargs rm -f
+find doc -name Makefile.in | xargs rm -f
+find idl -name Makefile.in | xargs rm -f
+find resources -name Makefile.in | xargs rm -f
+find salome_adm -name Makefile.in | xargs rm -f
+find src -name Makefile.in | xargs rm -f
+rm -f Makefile.in

diff --git a/configure.ac b/configure.ac
index 3b5e9a85dcf882a8dd14ae0199d824a6fd0eddb0..dc8409a21c0d8aa2b4943d57ceabdac81462da42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # Created from configure.in.base
 #
 
-AC_INIT([Salome2 Project NETGENPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [salome])
+AC_INIT([Salome2 Project NETGENPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeNETGENPLUGIN])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET

diff --git a/idl/Makefile.am b/idl/Makefile.am
index fee15b32c5fcc8f5ed318c04fff4a95a562fb6e7..aad0166c04514988bf46a4e645b0664de76e4b52 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -28,21 +28,19 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 BASEIDL_FILES= NETGENPlugin_Algorithm.idl
 
-EXTRA_DIST+= $(BASEIDL_FILES)
-
 # This variable defines the files to be installed
-salomeidl_DATA = $(BASEIDL_FILES)
+dist_salomeidl_DATA = $(BASEIDL_FILES)
 
 # GUI idl common library
 lib_LTLIBRARIES = libSalomeIDLNETGENPLUGIN.la
 
 # Sources built from idl files
-nodist_libSalomeIDLNETGENPLUGIN_la_SOURCES= NETGENPlugin_AlgorithmSK.cc
+nodist_libSalomeIDLNETGENPLUGIN_la_SOURCES = NETGENPlugin_AlgorithmSK.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)
 
-libSalomeIDLNETGENPLUGIN_la_CPPFLAGS =\
+libSalomeIDLNETGENPLUGIN_la_CPPFLAGS = \
        $(KERNEL_CXXFLAGS) \
        $(GEOM_CXXFLAGS) \
        $(SMESH_CXXFLAGS) \
@@ -51,7 +49,6 @@ libSalomeIDLNETGENPLUGIN_la_CPPFLAGS =\
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl
 
-
 libSalomeIDLNETGENPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libSalomeIDLNETGENPLUGIN_la_LIBADD  = \
        $(KERNEL_LDFLAGS) -lSalomeIDLKernel \
@@ -90,14 +87,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 df00b4d3bb60b22230c411d5d1c4aec4bcf4a40d..df79b55be435e43975ce62cb6f32ecec480f1ad1 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -27,13 +27,19 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-dist_salomeres_DATA = \
-       mesh_algo_netgen_2d.png \
-       mesh_algo_netgen_2d3d.png \
-       mesh_hypo_netgen.png \
-       mesh_hypo_netgen_2d.png \
-       mesh_tree_algo_netgen_2d.png \
-       mesh_tree_algo_netgen_2d3d.png \
-       mesh_tree_hypo_netgen.png \
-       mesh_tree_hypo_netgen_2d.png \
-       NETGENPlugin.xml
+dist_salomeres_DATA =          \
+       NETGENPlugin.xml        \
+       SalomeApp.xml
+
+if NETGENPLUGIN_ENABLE_GUI
+  dist_salomeres_DATA +=               \
+       mesh_algo_netgen_2d.png         \
+       mesh_algo_netgen_2d3d.png       \
+       mesh_hypo_netgen.png            \
+       mesh_hypo_netgen_2d.png         \
+       mesh_tree_algo_netgen_2d.png    \
+       mesh_tree_algo_netgen_2d3d.png  \
+       mesh_tree_hypo_netgen.png       \
+       mesh_tree_hypo_netgen_2d.png    \
+       mesh_tree_algo_netgen.png
+endif

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..85bd7ad
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,9 @@
+<document>
+  <section name="resources">
+    <parameter name="NETGENPlugin" value="${NETGENPLUGIN_ROOT_DIR}/share/salome/resources/netgenplugin"/>
+  </section>
+  <section name="SMESH">
+    <!-- Default SMESH module plugins -->
+    <parameter name="plugins" value="NETGENPlugin,GHS3DPlugin"/>
+  </section>
+</document>

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 3d994ce283bbb26c21a49319741ff8c0b2eef80b..c2170cea6e0b26bce55db78c9ba4bdc87f613af3 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -33,7 +33,9 @@ lib_LTLIBRARIES = libNETGENPluginGUI.la
 
 dist_libNETGENPluginGUI_la_SOURCES = \
        NETGENPluginGUI.cxx \
+       NETGENPluginGUI_HypothesisCreator.h \
        NETGENPluginGUI_HypothesisCreator.cxx \
+       NETGENPluginGUI_SimpleCreator.h \
        NETGENPluginGUI_SimpleCreator.cxx
 
 MOC_FILES = \

diff --git a/src/Makefile.am b/src/Makefile.am
index f4af73a2ca135af8245aafaa05e1e06459fa954e..db0c244952e07b03160bbe092332d76510cfa09a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,10 +27,10 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-#SUBDIRS = NETGEN NETGENPlugin GUI
-
 SUBDIRS = NETGEN NETGENPlugin
 
 if NETGENPLUGIN_ENABLE_GUI
   SUBDIRS += GUI
 endif
+
+DIST_SUBDIRS = NETGEN NETGENPlugin GUI

diff --git a/src/NETGEN/Makefile.am b/src/NETGEN/Makefile.am
index 98801ddd8155927274c4d4eb358479767cbe1f47..06b9e545b99056ee400e3ef81fd3fbdc69a5af24 100644 (file)
--- a/src/NETGEN/Makefile.am
+++ b/src/NETGEN/Makefile.am
@@ -69,9 +69,13 @@ $(LIB_OBJ_O):
 
 nodist_libNETGEN_la_SOURCES =
 
-
-
 libNETGEN_la_LDFLAGS  = $(LIB_OBJ_O) \
        $(CAS_LDPATH) -lTKernel -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKMesh -lTKSTL $(FCLIBS) $(STDLIB)
 
 libNETGEN_la_DEPENDENCIES = $(LIB_OBJ_O)
+
+EXTRA_DIST += \
+       ReadMeForNgUsers        \
+       netgen43ForSalome.patch \
+       netgen45ForSalome.patch \
+       netgen45lib64.patch

diff --git a/src/NETGENPlugin/Makefile.am b/src/NETGENPlugin/Makefile.am
index 4371011dd4c758670e77eec27b97b5d1ce64e8a8..679e3cbf65cdae902a91b948e6f77b4abb1399a9 100644 (file)
--- a/src/NETGENPlugin/Makefile.am
+++ b/src/NETGENPlugin/Makefile.am
@@ -28,8 +28,26 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-# header files 
-salomeinclude_HEADERS =
+# header files
+salomeinclude_HEADERS = \
+        NETGENPlugin_NETGEN_3D.hxx \
+        NETGENPlugin_NETGEN_3D_i.hxx \
+        NETGENPlugin_NETGEN_2D.hxx \
+        NETGENPlugin_NETGEN_2D_i.hxx \
+        NETGENPlugin_NETGEN_2D3D.hxx \
+        NETGENPlugin_NETGEN_2D3D_i.hxx \
+        NETGENPlugin_NETGEN_2D_ONLY.hxx \
+        NETGENPlugin_NETGEN_2D_ONLY_i.hxx \
+        NETGENPlugin_Hypothesis.hxx \
+        NETGENPlugin_Hypothesis_i.hxx \
+        NETGENPlugin_Hypothesis_2D.hxx \
+        NETGENPlugin_Hypothesis_2D_i.hxx \
+       NETGENPlugin_SimpleHypothesis_2D.hxx \
+       NETGENPlugin_SimpleHypothesis_3D.hxx \
+       NETGENPlugin_SimpleHypothesis_2D_i.hxx \
+       NETGENPlugin_SimpleHypothesis_3D_i.hxx \
+       NETGENPlugin_Mesher.hxx \
+       NETGENPlugin_Defs.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libNETGENEngine.la