Fix 'make distcheck' problems

diff --git a/Makefile.am b/Makefile.am
index 567f59f1fbd5f27016286c3f079e9e45b0ce186f..f0ecde57522feb13ab4ffbc45531001cd17c27ee 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,9 +35,9 @@ else !GUI_ENABLE_CORBA
     IDLDIR =
 endif
 
-SUBDIRS = $(IDLDIR) adm_local resources src doc bin tools/dlgfactory
+SUBDIRS = $(IDLDIR) adm_local resources src doc bin tools
 
-DIST_SUBDIRS = idl adm_local resources src doc bin 
+DIST_SUBDIRS = idl adm_local resources src doc bin tools
 
 DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool adm_local/unix/config_files/config.guess adm_local/unix/config_files/config.sub adm_local/unix/config_files/depcomp adm_local/unix/config_files/install-sh adm_local/unix/config_files/libtool.m4 adm_local/unix/config_files/ltmain.sh adm_local/unix/config_files/ltoptions.m4 adm_local/unix/config_files/ltsugar.m4 adm_local/unix/config_files/ltversion.m4 adm_local/unix/config_files/lt~obsolete.m4 adm_local/unix/config_files/missing adm_local/unix/config_files/py-compile
 

diff --git a/configure.ac b/configure.ac
index 4a3d6143b4dd20ff678d86f9a26d5d50c1ab2e29..7121072858084aac6044dd8839196f5e259dee16 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -671,6 +671,7 @@ AC_OUTPUT([ \
   src/GUI_PY/Makefile \
   resources/Makefile \
   idl/Makefile \
+  tools/Makefile \
   tools/dlgfactory/Makefile \
   Makefile
 ])

diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644 (file)
index 0000000..c912460
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,23 @@
+# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SUBDIRS = dlgfactory

diff --git a/tools/dlgfactory/Makefile.am b/tools/dlgfactory/Makefile.am
index 4588983a5a56587f5d10da37c6296d9cd942d19b..6945a9b9b2cbc4dc365344663ffd0264ead033a4 100644 (file)
--- a/tools/dlgfactory/Makefile.am
+++ b/tools/dlgfactory/Makefile.am
@@ -22,7 +22,7 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-# moc-files generation
+# moc-files generation (using MOC)
 %_moc.cxx: %.hxx
        $(MOC) $< -o $@
 
@@ -30,67 +30,75 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 ui_%.hxx: %.ui
        $(UIC) -o $@ $<
 
+# Program targets
+bin_PROGRAMS = qtester gtester
+
+# QDialog uic files
 UIC_FILES_QDIALOG = \
        ui_QDialogTest.hxx
 
-# MOC pre-processing
+# QDialog moc files
 MOC_FILES_QDIALOG = \
        QDialogTest_moc.cxx
 
+# GDialog uic files
+UIC_FILES_GDIALOG= \
+       ui_GenericDialog.hxx \
+       ui_GDialogTest.hxx
+
+# GDialog moc files
+MOC_FILES_GDIALOG= \
+       GenericDialog_moc.cxx \
+       GDialogTest_moc.cxx
+
+QDIALOG_TEMPLATES = __QDIALOG__.ui __QDIALOG__.hxx __QDIALOG__.cxx
+GDIALOG_TEMPLATES = __GDIALOG__.ui __GDIALOG__.hxx __GDIALOG__.cxx
+
+# generated sources
 BUILT_SOURCES = $(UIC_FILES_QDIALOG) $(UIC_FILES_GDIALOG)
 
+# extra distributed files
+EXTRA_DIST += $(QDIALOG_TEMPLATES) $(GDIALOG_TEMPLATES) GenericDialog.ui README.txt dlgfactory.sh
+
 mostlyclean-local:
-       rm -f @builddir@/*_moc.cxx @builddir@/ui_*.hxx
        rm @builddir@/QDialogTest*
        rm @builddir@/GDialogTest*
+       rm -f @builddir@/*_moc.cxx @builddir@/ui_*.hxx
 
-QDialogTest.ui: __QDIALOG__.ui __QDIALOG__.hxx __QDIALOG__.cxx dlgfactory.sh
+QDialogTest.hxx QDialogTest.cxx QDialogTest.ui: $(QDIALOG_TEMPLATES) dlgfactory.sh
        $(srcdir)/dlgfactory.sh -n QDialogTest -t qdialog
 
-GDialogTest.ui: __GDIALOG__.ui __GDIALOG__.hxx __GDIALOG__.cxx dlgfactory.sh
+GDialogTest.hxx GDialogTest.cxx GDialogTest.ui : $(GDIALOG_TEMPLATES) dlgfactory.sh
        $(srcdir)/dlgfactory.sh -n GDialogTest -t gdialog
 
-
 QT_CXXFLAGS=@QT_INCLUDES@ @QT_MT_INCLUDES@
 QT_LIBS=@QT_LIBS@
 
-# Program targets
-bin_PROGRAMS = qtester gtester
-
 # QDialog tester
 qtester_SOURCES = \
-        qtester.cxx \
+        qtester.cxx
+nodist_qtester_SOURCES =  \
        QDialogTest.cxx \
-       $(MOC_FILES_QDIALOG) $(UIC_FILES_QDIALOG)
+       $(MOC_FILES_QDIALOG) \
+       $(UIC_FILES_QDIALOG)
 
 qtester_CPPFLAGS = \
-       $(QT_CXXFLAGS) \
-       -I. \
-       -I$(srcdir)
+       $(QT_CXXFLAGS)
 
 qtester_LDFLAGS = \
         $(QT_LIBS)
 
-
-# GDialog tester
-MOC_FILES_GDIALOG= \
-       GenericDialog_moc.cxx \
-       GDialogTest_moc.cxx
-
-UIC_FILES_GDIALOG= \
-       ui_GenericDialog.hxx \
-       ui_GDialogTest.hxx
-
 gtester_SOURCES = \
        gtester.cxx \
-       GenericDialog.cxx \
+       GenericDialog.hxx \
+       GenericDialog.cxx
+nodist_gtester_SOURCES = \
        GDialogTest.cxx \
-       $(MOC_FILES_GDIALOG) $(UIC_FILES_GDIALOG)
+       $(MOC_FILES_GDIALOG) \
+       $(UIC_FILES_GDIALOG)
 
 gtester_CPPFLAGS = \
-       $(QT_CXXFLAGS) \
-       -I. \
-       -I$(srcdir)
+       $(QT_CXXFLAGS)
 
 gtester_LDFLAGS = \
         $(QT_LIBS)