From dca9cdf9e322d1908f9e209abda97d1a8e8b45a6 Mon Sep 17 00:00:00 2001 From: skv Date: Tue, 28 May 2013 12:58:33 +0000 Subject: [PATCH] make distcheck fix --- Makefile.am | 1 + scripts/Makefile.am | 11 +++++------ src/Makefile.am | 17 ++++++++++++----- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3f3227b..458d8e2 100644 --- 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 5c51488..b02ecda 100644 --- 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 5d11edd..4c2639c 100644 --- 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 -- 2.30.2