Join modifications from branch OCC_development_for_3_2_0a2

[modules/visu.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9f8be6bc7205f368097b3356e8ee0122e1f9362e..a2d20a326135bccb999fdd39696f054f045caded 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,37 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:
 
 @COMMENCE@
 
-SUBDIRS = idl src
-
-RESOURCES_FILES = \
-ModuleVisu.png \
-Visu_anim.png \
-Visu_cutplane.png \
-Visu_deformed.png \
-Visu_deformed_anim.png \
-Visu_eraseall.png \
-Visu_isosurfaces.png \
-Visu_plot2d.png \
-Visu_plot3d.png \
-Visu_points.png \
-Visu_sameas.png \
-Visu_scalars.png \
-Visu_scalars_anim.png \
-Visu_selectall.png \
-Visu_selectionactor.png \
-Visu_selectioncell.png \
-Visu_selectionedge.png \
-Visu_selectionpoint.png \
-Visu_selectonly.png \
-Visu_surface.png \
-Visu_vectors.png \
-Visu_wireframe.png \
-Visu_scaling.png \
-VISU_en.xml \
-VISU_fr.xml \
-VISUCatalog.xml \
-Visu_tree_visu.png \
-Visu_streamlines.png
+SUBDIRS = idl src doc adm_local
 
 BIN_SCRIPT= \
 VERSION
@@ -66,10 +36,10 @@ include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
 # test if SALOMEconfig.h has changed (contents)
 salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
        @if ! [ -a $@ ]; then \
-         cp -p $< $@;        \
+         cp -p -f $< $@;        \
        fi;                   \
        if ! cmp $< $@; then  \
-         cp -p $< $@;        \
+         cp -p -f $< $@;        \
        fi;                   \
 
 include/salome/sstream: salome_adm/unix/sstream
@@ -93,7 +63,7 @@ install-include: $(include_list)
        $(INSTALL) -d  $(includedir)
        @for f in X $(include_list); do                         \
           if test $$f != X; then                               \
-            ($(INSTALL_DATA) $$f $(includedir)/. || exit 1);   \
+            ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1);        \
           fi;                                                  \
        done