From edd214ce0a6168c8d5d8cc512ed2277ee48d65c6 Mon Sep 17 00:00:00 2001
From: ageay <ageay>
Date: Tue, 19 Oct 2010 09:08:15 +0000
Subject: [PATCH] *** empty log message ***

---
 src/MEDLoader/Makefile.am | 48 ++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/MEDLoader/Makefile.am b/src/MEDLoader/Makefile.am
index ab110a19d..3a2fbb760 100755
--- a/src/MEDLoader/Makefile.am
+++ b/src/MEDLoader/Makefile.am
@@ -17,39 +17,35 @@
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#  MED MEDMEM_SWIG : binding of C++ implementation and Python
-#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-lib_LTLIBRARIES = _libMEDLoader_Swig.la
-
-salomeinclude_HEADERS =  \
-	libMEDLoader_Swig.i MEDLoaderTypemaps.i
-
-SWIG_DEF = libMEDLoader_Swig.i MEDLoaderTypemaps.i
+MEDLOADER_SUBDIRS =
 
-SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../../MEDCoupling -I$(srcdir)/../../MEDCoupling_Swig \
-	-I$(srcdir)/../../INTERP_KERNEL -I$(srcdir)/../../INTERP_KERNEL/Bases
+if !MED_ENABLE_MICROMED
+   MEDLOADER_SUBDIRS += . Swig
+if CPPUNIT_IS_OK
+   MEDLOADER_SUBDIRS += Test
+endif
+endif
 
-dist__libMEDLoader_Swig_la_SOURCES   = $(SWIG_DEF)
-nodist__libMEDLoader_Swig_la_SOURCES = libMEDLoader_Swig_wrap.cxx
-libMEDLoader_Swig.py: libMEDLoader_Swig_wrap.cxx
+SUBDIRS = $(MEDLOADER_SUBDIRS)
 
-libMEDLoader_Swig_wrap.cxx: $(SWIG_DEF)
-	$(SWIG) $(SWIG_FLAGS) -o $@  $<
+#DIST_SUBDIRS = Swig
 
-_libMEDLoader_Swig_la_CPPFLAGS = $(PYTHON_INCLUDES) \
-	$(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
-	-I$(srcdir)/../../INTERP_KERNEL \
-	-I$(srcdir)/.. -I$(srcdir)/../../MEDCoupling_Swig -I$(srcdir)/../../INTERP_KERNEL/Bases \
-	-I$(srcdir)/../../MEDCoupling
+lib_LTLIBRARIES = libmedloader.la
 
-_libMEDLoader_Swig_la_LDFLAGS  = -module $(MED2_LIBS) $(HDF5_LIBS) $(PYTHON_LIBS) \
-	../../MEDCoupling/libmedcoupling.la ../../INTERP_KERNEL/libinterpkernel.la \
-	../libmedloader.la
+salomeinclude_HEADERS= \
+MEDLoaderDefines.hxx \
+MEDLoader.hxx MEDLoaderBase.hxx
 
-CLEANFILES = libMEDLoader_Swig_wrap.cxx libMEDLoader_Swig.py
+dist_libmedloader_la_SOURCES= \
+MEDLoader.cxx MEDLoaderBase.cxx
 
-dist_salomescript_DATA= libMEDLoader_Swig.py MEDLoaderDataForTest.py MEDLoaderTest.py MEDLoaderTest2.py
+libmedloader_la_CPPFLAGS= $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+	-I$(srcdir)/../INTERP_KERNEL \
+	-I$(srcdir)/../INTERP_KERNEL/Geometric2D \
+	-I$(srcdir)/../INTERP_KERNEL/Bases \
+	-I$(srcdir)/../MEDCoupling
 
-UNIT_TEST_PROG = MEDLoaderTest.py MEDLoaderTest2.py
\ No newline at end of file
+libmedloader_la_LDFLAGS= ../MEDCoupling/libmedcoupling.la \
+../INTERP_KERNEL/libinterpkernel.la $(MED2_LIBS) $(HDF5_LIBS)
-- 
2.39.2