DCQ : Merge with Ecole Ete a6.

[modules/med.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a12eac712617dc67787652b04ec424074cd992b6..269e8a520604c38d3cf7d826297b24a1976352ce 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,21 +9,77 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:${KERNEL_ROOT_DIR}/idl/salome
 
 
 @COMMENCE@
 
-SUBDIRS = idl src
+SUBDIRS = idl src doc
 
 RESOURCES_FILES = \
-Med_en.xml \
+MEDCatalog.xml \
+MED_en.xml \
+MED.config \
 Data.png \
 Infos.png \
 Structure.png \
-ModuleMed.png
-
-BIN_SCRIPT=
+ModuleMed.png \
+carre_en_quad4.med \
+carre_en_quad4_seg2.med \
+cube_hexa8.med \
+cube_hexa8_quad4.med \
+maill.0.med \
+maillage_UniSegFam.med \
+mesh.med \
+pointe.med \
+test19.med \
+zzzz121b.med \
+Darcy3_3D_H_10x10x10.sauve \
+dx200_dy1_avec_2couches.sauve \
+elle_2D_QT_10x10.sauve \
+elle_2D_QT_2x2.sauve \
+elle_2D_QT_40x40.sauve \
+elle_2D_QT_4x4.sauve \
+elle_3D_HPr_10x10x10.sauve \
+elle_3D_HPr_2x2x2.sauve \
+elle_3D_HPr_4x4x4.sauve \
+inclusion_2d_raf.sauve \
+inclusion_2d.sauve \
+mail_ktest1-3-hexa.sauve \
+mail_ktest1-3-tetra.sauve \
+mail_ktest3-1.sauve \
+mail_ktest3-2.sauve \
+maillage_andra2_100elts.sauve \
+maillage_cas2_2d.sauve \
+maillage_cas4_234elts.sauve \
+maillage_CHEMVAL_100elts.sauve \
+maillage_CHEMVAL_40elts.sauve \
+maillage_chemvalIV_cas1_100elts.sauve \
+maillage_chemvalIV_cas1_40elts.sauve \
+mail_test1-1-qua.sauve \
+mail_test1-1-tri.sauve \
+mail_test1-2-qua.sauve \
+mail_test1-2-tri.sauve \
+mail-test1-4-1.sauve \
+mail-test1-4-2.sauve \
+boitenew.inp \
+Case1.inp \
+cube.inp \
+test3.inp \
+titi.inp \
+boitenew.cnc \
+Case1.cnc \
+cube.cnc \
+test3.cnc \
+titi.cnc \
+boitenew.xyz \
+Case1.xyz \
+cube.xyz \
+test3.xyz \
+titi.xyz
+
+BIN_SCRIPT= \
+VERSION
 
 
 # copy header files in common directory
@@ -35,10 +91,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) ../../$< $@
@@ -60,7 +125,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