X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=9841fc0a983fbb23321090cd41c1e43d71f0ea6e;hb=2f31018b18cc557b02e3b8b71396ab3b4f606e97;hp=3f11d985656176b521c30e01675201b40ad38dee;hpb=aeb48974ed761c5e30d44a83149330153dc13d85;p=modules%2Fmed.git diff --git a/src/Makefile.am b/src/Makefile.am index 3f11d9856..9841fc0a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -29,12 +29,13 @@ COMMON_SUBDIRS = INTERP_KERNEL MEDCoupling # Unitary tests for INTERP_KERNEL ### +if MED_ENABLE_MED3 + COMMON_SUBDIRS += MEDLoader + if CPPUNIT_IS_OK INTERPTEST_SUBDIRS = INTERP_KERNELTest endif -if MED_ENABLE_MED3 - COMMON_SUBDIRS += MEDLoader endif ### @@ -59,18 +60,14 @@ endif if !MED_ENABLE_MICROMED - BASE_SUBDIRS = MEDWrapper MEDMEM MEDCoupling_Swig MEDMEM_SWIG MEDMEMBinTest + BASE_SUBDIRS = MEDCoupling_Swig if MPI_IS_OK PARAMEDMEM_SUBDIRS += ParaMEDMEM_Swig endif -if CPPUNIT_IS_OK - BASE_SUBDIRS += MEDMEMCppTest -endif - if MED_ENABLE_SPLITTER - SPLITTER_SUBDIRS = MEDSPLITTER MEDSPLITTER_Swig MEDPartitioner + SPLITTER_SUBDIRS = MEDPartitioner endif if MED_ENABLE_RENUMBER @@ -78,7 +75,7 @@ if MED_ENABLE_RENUMBER endif if MED_ENABLE_KERNEL - KERNEL_SUBDIRS = MEDCouplingCorba MEDCouplingCorba_Swig MEDMEM_I MED MedCorba_Swig MED_SWIG MedClient + KERNEL_SUBDIRS = MEDCouplingCorba MEDCouplingCorba_Swig if MPI_IS_OK KERNEL_SUBDIRS += ParaMEDCouplingCorba ParaMEDMEMComponent @@ -101,8 +98,8 @@ SUBDIRS = $(COMMON_SUBDIRS) $(PARAMEDMEM_SUBDIRS) $(BASE_SUBDIRS) $(INTERPTEST_S $(SPLITTER_SUBDIRS) $(RENUMBER_SUBDIRS) $(KERNEL_SUBDIRS) $(GUI_SUBDIRS) DIST_SUBDIRS= \ - MEDWrapper INTERP_KERNEL MEDMEM MEDCoupling MEDCoupling_Swig MEDMEM_SWIG \ - MEDMEMBinTest MEDMEMCppTest INTERP_KERNELTest ParaMEDMEM ParaMEDMEM_Swig MEDLoader \ - MEDSPLITTER MEDSPLITTER_Swig MEDPartitioner RENUMBER MEDCouplingCorba MEDCouplingCorba_Swig \ - MEDMEM_I MED MED_SWIG MedCorba_Swig ParaMEDLoader MedClient ParaMEDMEMComponent \ + INTERP_KERNEL MEDCoupling MEDCoupling_Swig \ + INTERP_KERNELTest ParaMEDMEM ParaMEDMEM_Swig MEDLoader \ + MEDPartitioner RENUMBER MEDCouplingCorba MEDCouplingCorba_Swig \ + ParaMEDLoader ParaMEDMEMComponent \ ParaMEDCouplingCorba MEDCalculator MEDGUI MEDOP ParaMEDMEMTest