DCQ : Limit Torus use

[modules/geom.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e7d06427116fa66d6fcb4091d0439d949178da69..d5c51e9cfe23eefd5605515ca262fdbc2ad3cc9b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,11 +14,14 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 @COMMENCE@
 
-SUBDIRS = idl src
+SUBDIRS = idl src doc
 
 RESOURCES_FILES = \
 GEOM_en.xml \
 GEOM_fr.xml \
+GEOM.config \
+GEOMCatalog.xml \
+GEOMDS_Resources \
 arc.png \
 archimede.png \
 axisinertia.png \
@@ -119,7 +122,12 @@ tree_wire.png \
 vector.png \
 vector2points.png \
 vectordxyz.png \
-whatis.png
+whatis.png \
+ellipse.png \
+ellipsepointvector.png
+
+BIN_SCRIPT= \
+VERSION
 
 # copy header files in common directory
 ifeq ($(HAVE_SSTREAM),yes)
@@ -130,10 +138,19 @@ endif
 
 inc: idl $(include_list)
 
-include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.h
+include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
        -$(RM) $@
        $(LN_S) ../../$< $@
 
+# test if SALOMEconfig.h has changed (contents)
+salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
+       @if ! [ -a $@ ]; then \
+         cp -p -f $< $@;        \
+       fi;                   \
+       if ! cmp $< $@; then  \
+         cp -p -f $< $@;        \
+       fi;                   \
+
 include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
@@ -153,10 +170,10 @@ install-end:
 
 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);   \
-          fi;                                                  \
+       @for f in X $(include_list); do                                 \
+          if test $$f != X; then                                       \
+            ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1);        \
+          fi;                                                          \
        done
 
 # install script in $(bindir) :