From: vsr <vsr@opencascade.com>
Date: Thu, 11 Sep 2008 05:21:38 +0000 (+0000)
Subject: Implement 'make dist' and 'make distcheck' steps support
X-Git-Tag: TG_TRIPOLI_qt4_porting~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=76943ff95fd53147b9201ab493a33d09517bef78;p=modules%2Fgui.git

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

diff --git a/Makefile.am b/Makefile.am
index 40130e280..f03a94172 100644
--- 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 63514a721..3b4c5acd9 100644
--- 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 0236bfbbd..f94fb0c28 100644
--- 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