From f9820dde78daf4e4ad5c85e2f35c3d0e18b1e29c Mon Sep 17 00:00:00 2001 From: prascle Date: Wed, 15 Feb 2006 15:40:08 +0000 Subject: [PATCH] PR: make distcheck works --- Makefile.am | 4 +++- bin/Makefile.am | 12 ++++++++++-- idl/Makefile.am | 10 +++++----- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index e8bf882a3..ca8fe996d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,4 +11,6 @@ endif SUBDIRS = $(IDLDIR) src doc salome_adm bin resources -DIST_SUBDIRS= idl src doc salome_adm bin resources \ No newline at end of file +DIST_SUBDIRS= idl src doc salome_adm bin resources + +DISTCLEANFILES = a.out diff --git a/bin/Makefile.am b/bin/Makefile.am index 2d7ae89ee..eecb208a3 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -42,11 +42,19 @@ EXTRA_DIST = appliskel dist-hook: rm -rf `find $(distdir)/appliskel -name CVS` +DISTCLEANFILES = $(top_builddir)/bin/@PACKAGE@/Makefile.am -install: install-am install-appliskel +clean-local: + rm -rf $(top_builddir)/bin/@PACKAGE@/appliskel + cd $(top_builddir)/bin/@PACKAGE@; \ + rm -f $(dist_salomescript_DATA) $(dist_salomescript_SCRIPTS) # This is an ugly target to avoid exploring the appliskel subdirectory. -install-appliskel: +install-exec-local: $(INSTALL) -d $(salomescriptdir) cp -r $(srcdir)/appliskel $(salomescriptdir) find $(salomescriptdir) -name CVS | xargs rm -rf + +uninstall-local: + find $(salomescriptdir)/appliskel -exec chmod +w {} \; + rm -rf $(salomescriptdir)/appliskel diff --git a/idl/Makefile.am b/idl/Makefile.am index 4f9c184e5..3f41523bf 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -98,16 +98,16 @@ SUFFIXES = .idl .hh SK.cc $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< -# This target overload the standard definition of install. The target -# install-pyidl is added to process python corba stubs for SALOME. -install: install-am install-pyidl - -install-pyidl: $(IDL_FILES:%=$(top_srcdir)/idl/%) +install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%) $(INSTALL) -d $(pkgpythondir) ls $^ | while read file; do \ $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ done +# uninstall-local removes too much, but it works in distcheck +uninstall-local: + rm -rf $(pkgpythondir)/* + mostlyclean-local: -rm -f *.hh *.cc .depidl -- 2.39.2