improvement to building of resources:

1) if "RESOURCES_FILES" variable is NOT defined in Makefile.in, then ALL files from srcdir/resources are copied to builddir/share/salome/resources
2) including directories ("cp -fr" is used)
3) except "CVS" directory

diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in
index 227bf1634f2d5c379073b22468df3dd4272698e5..338fed0cf29a6af0486cffc2296273b64e98f041 100644 (file)
--- a/salome_adm/unix/make_conclude.in
+++ b/salome_adm/unix/make_conclude.in
@@ -152,6 +152,9 @@ $(DEST_HEADERS): $(inc_builddir)/%: %
        cp -f $< $@
 
 # build resources file (icons and messages) : .qm file from .po file
+RESOURCES_FILES_ALL = $(notdir $(wildcard $(srcdir)/resources/*))
+RESOURCES_FILES ?= $(RESOURCES_FILES_All)
+
 resources: resources-po resources-cp 
 
 resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
@@ -159,7 +162,9 @@ resources-po: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/%.qm)
 resources-cp: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
 
 $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
-       cp -f $< $@
+       if [ $(notdir $<) != "CVS" ] ; then \
+           cp -fr $< $@; \
+       fi
 
 # Make installation directories if they don't exist.
 $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir):

diff --git a/salome_adm/unix/make_module.in b/salome_adm/unix/make_module.in
index 2d08f49bad01dab3aadeb91983b0dc88cdc0f814..bfbb3036e203e96339ebcf2bb8834908901ded2f 100644 (file)
--- a/salome_adm/unix/make_module.in
+++ b/salome_adm/unix/make_module.in
@@ -45,13 +45,18 @@ depend:
        done
 
 # copy all resources files in common directory
+RESOURCES_FILES_ALL = $(notdir $(wildcard $(srcdir)/resources/*))
+RESOURCES_FILES ?= $(RESOURCES_FILES_All)
+
 resources: $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%)
        @@SETX@; for d in $(SUBDIRS); do        \
           (cd $$d && $(MAKE) $@) || exit 1;    \
        done
 
 $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/%): $(top_builddir)/share/salome/resources/% : %
-       cp -f $< $@
+       if [ $(notdir $<) != "CVS" ] ; then \
+           cp -fr $< $@; \
+       fi
 
 data:
        @if test "X$(top_builddir)" = "X."; then                                                         \