Fix make distcheck problem

diff --git a/src/GuiHelpers/Makefile.am b/src/GuiHelpers/Makefile.am
index 1da8a1a8f52b453f58d2abac3e4fa58e4a9ec2d6..a59a8258efa21fe5c9122a0d27ea34acff840ed3 100644 (file)
--- a/src/GuiHelpers/Makefile.am
+++ b/src/GuiHelpers/Makefile.am
@@ -73,9 +73,9 @@ libSalomeGuiHelpers_la_LDFLAGS  = \
        $(MOC) $< -o $@
 
 # MOC pre-processing
-MOC_FILES = \
+MOC_FILES_HXX = \
        StandardApp_Module_moc.cxx
 
-nodist_libSalomeGuiHelpers_la_SOURCES = $(MOC_FILES)
+nodist_libSalomeGuiHelpers_la_SOURCES = $(MOC_FILES_HXX)
 
-EXTRA_DIST+=$(MOC_FILES:%_moc.cxx=%.hxx)
+EXTRA_DIST+=$(MOC_FILES_HXX:%_moc.cxx=%.hxx)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0769f85c75ad9ce6ef47ea58d16d7a9503df5a5b..68d484e19ae237accd86135f7954b717e81b1bbf 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,6 @@ SUBDIRS_LIGHT = LightApp ResExporter
 ##
 if GUI_ENABLE_CORBA
   SUBDIRS_CORBA = TOOLSGUI Session SalomeApp GuiHelpers TreeData
-  SUBDIRS_CORBA += TreeData/Test
 endif
 
 
@@ -124,5 +123,5 @@ SUBDIRS = $(SUBDIRS_COMMON) $(SUBDIRS_OBJECT) $(SUBDIRS_VIEWERTOOLS) $(SUBDIRS_G
 
 DIST_SUBDIRS = CASCatch Qtx Style DDS QDS ObjBrowser SUIT SUITApp STD CAF CAM LogWindow Prs Event OpenGLUtils \
                OBJECT ViewerTools GLViewer VTKViewer SVTK OCCViewer SOCC Plot2d SPlot2d SUPERVGraph QxGraph QxScene \
-               PyInterp PyConsole LightApp ResExporter TOOLSGUI Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT \
-               GUI_PY
+               PyInterp PyConsole LightApp ResExporter TOOLSGUI Session SalomeApp GuiHelpers TreeData \
+               SALOME_SWIG SALOME_PY SALOME_PYQT GUI_PY

diff --git a/src/TreeData/Makefile.am b/src/TreeData/Makefile.am
index 025b2c8ba0f480382316dff31319cc7878b821c6..0df8f18bdac55cbca81838d597add28657be3dc4 100644 (file)
--- a/src/TreeData/Makefile.am
+++ b/src/TreeData/Makefile.am
@@ -23,6 +23,8 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+SUBDIRS = . Test
+
 # moc-files generation
 %_moc.cxx: %.hxx
        $(MOC) $< -o $@
@@ -60,12 +62,12 @@ dist_libSalomeTreeData_la_SOURCES = \
        TreeGuiManager.cxx
 
 # MOC pre-processing
-MOC_FILES = \
+MOC_FILES_HXX = \
        TreeModel_moc.cxx \
        TreeView_moc.cxx \
        TreeObserver_moc.cxx
 
-nodist_libSalomeTreeData_la_SOURCES = $(MOC_FILES)
+nodist_libSalomeTreeData_la_SOURCES = $(MOC_FILES_HXX)
 
 CORBA_CXXFLAGS=@OMNIORB_CXXFLAGS@ @OMNIORB_INCLUDES@
 CORBA_LIBS=@OMNIORB_LIBS@

diff --git a/src/TreeData/Test/Makefile.am b/src/TreeData/Test/Makefile.am
index a708d2f8be15f2ccbf1ca8ecec66d7a558225575..9435f00433d13dfbbf3b701a0a3ad5ce905f59a3 100644 (file)
--- a/src/TreeData/Test/Makefile.am
+++ b/src/TreeData/Test/Makefile.am
@@ -57,7 +57,7 @@ TEST_LDFLAGS  = \
 # Program targets
 bin_PROGRAMS = TreeData_guitester TreeData_tester
 
-MOC_FILES = \
+MOC_FILES_HXX = \
        mainwindow_moc.cxx
 
 UIC_FILES = \
@@ -65,12 +65,15 @@ UIC_FILES = \
 
 BUILT_SOURCES = $(UIC_FILES)
 
-nodist_TreeData_guitester_SOURCES = $(MOC_FILES) $(UIC_FILES)
+nodist_TreeData_guitester_SOURCES = $(MOC_FILES_HXX) $(UIC_FILES)
 
 TreeData_guitester_SOURCES = \
+       testhelper.hxx \
        testhelper.cxx \
        guitester.cxx \
+       mainwindow.hxx \
        mainwindow.cxx \
+       MyDataModel.hxx \
        MyDataModel.cxx
 
 TreeData_guitester_CPPFLAGS = \
@@ -95,4 +98,3 @@ test_DATA = \
        data.txt
 
 EXTRA_DIST+=$(test_DATA)
-