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

diff --git a/Makefile.am b/Makefile.am
index 40130e280da73a146a83c6524f8a5af377a41319..f03a94172059cb6fa20749e775c06d18e969590b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,9 +39,9 @@ DISTCLEANFILES = a.out aclocal.m4 configure
 
 salomeinclude_DATA = GUI_version.h
 
-EXTRA_DIST += \
-       build_configure \
-       clean_configure \
+EXTRA_DIST +=          \
+       build_configure \
+       clean_configure \
        LICENCE
 
 dist-hook:

diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am
index 63514a721b94af21093507f54bd9af5b20b8afcc..3b4c5acd9f4f64898f08d9679eced8355e906608 100644 (file)
--- a/adm_local/unix/config_files/Makefile.am
+++ b/adm_local/unix/config_files/Makefile.am
@@ -18,22 +18,22 @@
 # 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-dist_admlocalm4_DATA=\
-check_disable_Corba.m4 \
-check_GLViewer.m4 \
-check_GUI.m4 \
-check_msg2qm.m4 \
-check_OCCViewer.m4 \
-check_opengl.m4 \
-check_Plot2dViewer.m4 \
-check_PyConsole.m4 \
-check_pyqt.m4 \
-check_qt.m4 \
-check_qwt.m4 \
-check_SalomeObject.m4 \
-check_sip.m4 \
-check_SupervGraphViewer.m4 \
-check_vtk.m4 \
-check_VTKViewer.m4 \
-check_corba_in_GUI.m4 \
+dist_admlocalm4_DATA =         \
+check_disable_Corba.m4         \
+check_GLViewer.m4              \
+check_GUI.m4                   \
+check_msg2qm.m4                        \
+check_OCCViewer.m4             \
+check_opengl.m4                        \
+check_Plot2dViewer.m4          \
+check_PyConsole.m4             \
+check_pyqt.m4                  \
+check_qt.m4                    \
+check_qwt.m4                   \
+check_SalomeObject.m4          \
+check_sip.m4                   \
+check_SupervGraphViewer.m4     \
+check_vtk.m4                   \
+check_VTKViewer.m4             \
+check_corba_in_GUI.m4          \
 check_QxGraphViewer.m4

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 0236bfbbd1f6c9b8669e174d06db9a7134d22501..f94fb0c28a66e8e5aa31f5364a0479a8263799ce 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -45,14 +45,20 @@ docdir             = $(datadir)/doc/salome
 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) $(nodist_salomeres_DATA:%.qm=resources/%.ts)
+EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \
+             $(UIC_FILES:ui_%.h=%.ui) $(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
+       rm -f @builddir@/ui_*.h
 
 # tests
 tests: unittest