From: vsr Date: Wed, 18 Apr 2012 12:33:51 +0000 (+0000) Subject: Fix problem of make distcheck on automake 1.11 (Mandriva 2010): X-Git-Tag: TRIPOLI_323 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9c02f5b02703775bef6c6fc6ce0d5eba1c24721c;hp=8f3bbce4f2937453497eaf362b75dd1483ff2a56;p=samples%2Fsierpinsky.git Fix problem of make distcheck on automake 1.11 (Mandriva 2010): - we have to uninstall only the staff generated for idl files and nothing more --- diff --git a/idl/Makefile.am b/idl/Makefile.am index bf8f1a5..e17e861 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -26,6 +26,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = Sierpinsky.idl +BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) + # This variable defines the files to be installed dist_salomeidl_DATA = $(BASEIDL_FILES) @@ -82,9 +84,15 @@ install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done -# uninstall-local removes too much, but it works in distcheck +# we want to remove only staff generated for IDL files and nothing more uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/* + @for modulen in SIERPINSKY_ORB ; do \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ + done ; \ + for filen in $(BASEIDL_FILES_PY) ; do \ + echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ + done mostlyclean-local: -rm -f *.hh *.cc .depidl