From 4aa69df830008d844340636874875e46a8c2eba5 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 1 Mar 2011 14:31:44 +0000 Subject: [PATCH] 0021196: [CEA 456] Integration and merge modification for debian packages This patch is for cleaning completely the build directory --- Makefile.am | 2 +- doc/salome/gui/GEOM/Makefile.am | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index ce1de12db..ccb4cf8a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,7 @@ SUBDIRS = idl adm_local resources src doc bin DIST_SUBDIRS = idl adm_local resources src doc bin -DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh +DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh adm_local/unix/config_files/config.guess adm_local/unix/config_files/config.sub adm_local/unix/config_files/depcomp adm_local/unix/config_files/install-sh adm_local/unix/config_files/libtool.m4 adm_local/unix/config_files/ltmain.sh adm_local/unix/config_files/ltoptions.m4 adm_local/unix/config_files/ltsugar.m4 adm_local/unix/config_files/ltversion.m4 adm_local/unix/config_files/lt~obsolete.m4 adm_local/unix/config_files/missing adm_local/unix/config_files/py-compile salomeinclude_DATA = GEOM_version.h diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am index 9740ec3ec..4825ee968 100755 --- a/doc/salome/gui/GEOM/Makefile.am +++ b/doc/salome/gui/GEOM/Makefile.am @@ -35,7 +35,7 @@ usr_docs: doxyfile_tui doxyfile_py doxyfile echo "===========================================" ; \ sed -e "/class geompyDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g" \ -e "s/geompyDC/geompy/g" $(top_srcdir)/src/GEOM_SWIG/geompyDC.py > \ - $(top_builddir)/src/GEOM_SWIG/geompy.py ; \ + ./geompy.py ; \ echo "===========================================" ; \ echo "Generating examples documentation" ; \ echo "===========================================" ; \ @@ -48,29 +48,30 @@ usr_docs: doxyfile_tui doxyfile_py doxyfile echo "Generating GUI documentation" ; \ echo "===========================================" ; \ $(DOXYGEN) doxyfile ; \ - rm -f $(top_builddir)/src/GEOM_SWIG/geompy.py + rm -f ./geompy.py docs: usr_docs clean-local: @for filen in `find . -maxdepth 1` ; do \ case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;; \ - . | .. | ./static ) ;; \ + ./Makefile* | ./doxyfile* | ./images | ./input | ./static ) ;; \ + . | .. ) ;; \ *) echo "Removing $${filen}" ; rm -rf $${filen} ;; \ esac ; \ done ; -install-data-local: usr_docs - $(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM - @for filen in `find . -maxdepth 1` ; do \ +install-data-local: + @if [ -e main.html ]; then \ + $(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM ; \ + for filen in `find . -maxdepth 1` ; do \ case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;; \ - ./doxyfile.bak | ./doxyfile_py.bak | ./doxyfile_tui.bak ) ;; \ + ./Makefile* | ./doxyfile* ) ;; \ . | .. | ./static ) ;; \ *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/GEOM ;; \ esac ; \ - done ; + done ; \ + fi uninstall-local: rm -rf $(DESTDIR)$(docdir)/gui/GEOM -- 2.39.2