make distcheck fix

diff --git a/Makefile.am b/Makefile.am
index 3f3227b1e8dfb26be1a1011a1efe860e56b854e4..458d8e27d7530e0edcb6e444c9638fac9f7ed980 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = src scripts
 
+DISTCLEANFILES = a.out

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 5c51488a2b30b2ad14bb4e963cece320dba75351..b02ecda2cebe3acd3d20be6e6356337f248824ac 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,7 +2,7 @@
 # Copyright (C) CEA, EDF
 # Author : Nicolas Crouzet (CEA)
 # --
-bin_SCRIPTS = hxx2salome \
+dist_bin_SCRIPTS = hxx2salome \
               parse01.awk \
               parse0.awk \
               parse1.awk \
@@ -11,8 +11,7 @@ bin_SCRIPTS = hxx2salome \
               renameSalomeModule \
               runIDLparser \
               SA_build \
-             SA_new_cpp_component \
-             cpp_compo_template.tgz
-
-install-data-hook:
-       \cp -f ${srcdir}/template_src.tgz ${srcdir}/template_coupling_src.tgz ${exec_prefix}/bin
+              SA_new_cpp_component \
+              cpp_compo_template.tgz \
+              template_src.tgz \
+              template_coupling_src.tgz

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d11edd1307d68369db1a1757d9789c78a281ee3..4c2639c2ec824ad2db7b3e2b25aa0082767e17b4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,15 +2,22 @@ bin_PROGRAMS = ghxx2salome
 
 AM_CPPFLAGS = @QT_MT_INCLUDES@ -DBINDIR="\"${bindir}\""
 LDADD = ${QT_LIB_DIR} -lQtCore -lQtGui
-CLEANFILES = hxx2salome_moc.cpp hxx2salome.h hxx2salome.cpp
 
-ghxx2salome_SOURCES = main.cpp hxx2salome.h hxx2salome.cpp hxx2salome_ui.h hxx2salome_moc.cpp
-BUILT_SOURCES = hxx2salome_ui.h hxx2salome_moc.cpp
+EXTRA_DIST = hxx2salome.ui
+
+UIC_FILES = hxx2salome_ui.h
+
+MOC_FILES = hxx2salome_moc.cpp
+
+BUILT_SOURCES = $(UIC_FILES) $(MOC_FILES)
+
+dist_ghxx2salome_SOURCES = main.cpp hxx2salome.h hxx2salome.cpp
+nodist_ghxx2salome_SOURCES = $(UIC_FILES) $(MOC_FILES)
+
+CLEANFILES = $(UIC_FILES) $(MOC_FILES)
 
 %_ui.h: %.ui
        $(UIC) -o $@ $<
 
 %_moc.cpp: %.h
        ${MOC} $< -o $@
-
-main.cpp: hxx2salome_ui.h hxx2salome_moc.cpp