PR: make distcheck works

diff --git a/Makefile.am b/Makefile.am
index e8bf882a3bd557e6fe97d700498693c032d4a19e..ca8fe996d5e3b65ff638696a305f7c3ea82696ac 100644 (file)
--- 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 2d7ae89ee404992e3627eab32403437c6c67df8d..eecb208a3fc6e1149441e635716e6b8780225057 100644 (file)
--- 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 4f9c184e5c1097bfa5ab2bdb1b73c01bb3f699dc..3f41523bf0d9472b8fe1c3804aaa9002a97a5d0f 100644 (file)
--- 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