Join modifications from branch V3_1_0_For_CCRT

[modules/med.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ab72f27280f6734addf90d24e8ef6f28fb93155f..9e82a931233599dbf4317618b7930782fa2a3d4e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,13 +14,18 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:
 
 @COMMENCE@
 
-ifeq (@WITHIHM@,no)
-      SUBDIRS = idl src
+SUBDIRS = src
+
+ifeq ($(MED_WITH_KERNEL),yes)
+      SUBDIRS+= idl
 endif
+
 ifeq (@WITHIHM@,yes)
-      SUBDIRS = idl src doc
+      SUBDIRS+= doc
 endif
 
+SUBDIRS+= adm_local
+
 RESOURCES_FILES = \
 MEDCatalog.xml \
 MED_en.xml \
@@ -55,6 +60,11 @@ Mistrat_import22.med \
 pointe_import22.med \
 TimeStamps_import22.med \
 poly3D.med \
+Darcy3_3D_H_10x10x10_2.med \
+elle_3D_HPr_10x10x10_2.med \
+elle_3D_HPr_2x2x2_2.med \
+elle_3D_HPr_4x4x4_2.med \
+test_2D.med \
 Darcy3_3D_H_10x10x10.sauve \
 dx200_dy1_avec_2couches.sauve \
 elle_2D_QT_10x10.sauve \
@@ -106,10 +116,10 @@ LDFLAGS= -L$(top_builddir)/lib/salome
 LDFLAGSFORBIN= -L$(top_builddir)/lib/salome
 
 # copy header files in common directory
-ifeq ($(HAVE_SSTREAM),yes)
-  include_list=include/salome/SALOMEconfig.h
-else
-  include_list=include/salome/SALOMEconfig.h include/salome/sstream
+include_list=include/salome/SALOMEconfig.h
+
+ifeq ($(HAVE_SSTREAM),no)
+  include_list+=include/salome/sstream
 endif
 
 inc: idl $(include_list)