From e6ca73cb29054833a494fb4b943e30d59d8507b3 Mon Sep 17 00:00:00 2001 From: ndjinga Date: Mon, 18 Feb 2008 09:56:21 +0000 Subject: [PATCH] correcting Makefile.am --- src/INTERP_KERNEL/Makefile.am | 6 +++--- src/INTERP_KERNEL/Test/Makefile.am | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/INTERP_KERNEL/Makefile.am b/src/INTERP_KERNEL/Makefile.am index 6483b1ccd..aee2f9b02 100644 --- a/src/INTERP_KERNEL/Makefile.am +++ b/src/INTERP_KERNEL/Makefile.am @@ -55,7 +55,7 @@ BoundingBox.cxx\ TetraAffineTransform.cxx\ Remapper.cxx -libinterpkernel_la_LDFLAGS= $(MED2_LIBS) $(HDF5_LIBS) -lmed_V2_1 $(STDLIB) -lmedmem -lutil +libinterpkernel_la_LDFLAGS= $(MED2_LIBS) $(HDF5_LIBS) ../MEDWrapper/V2_1/Core/libmed_V2_1.la $(STDLIB) ../MEDMEM/libmedmem.la -lutil -lm libinterpkernel_la_CPPFLAGS= @CXXTMPDPTHFLAGS@ \ -I$(srcdir) -I$(srcdir)/../MEDMEM $(BOOST_CPPFLAGS) -DOPTIMIZE -DLOG_LEVEL=0 \ @@ -68,8 +68,8 @@ if MED_ENABLE_KERNEL libinterpkernel_la_LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace endif -AM_CPPFLAGS= $(libmedmem_la_CPPFLAGS) -LDADD= $(libmedmem_la_LDFLAGS) -lm libmedmem.la +AM_CPPFLAGS= $(libinterpkernel_la_CPPFLAGS) +LDADD= $(libinterpkernel_la_LDFLAGS) if MED_ENABLE_KERNEL LDADD+=-lSALOMEBasics endif diff --git a/src/INTERP_KERNEL/Test/Makefile.am b/src/INTERP_KERNEL/Test/Makefile.am index 7c61f9f12..970a4ffd4 100644 --- a/src/INTERP_KERNEL/Test/Makefile.am +++ b/src/INTERP_KERNEL/Test/Makefile.am @@ -35,7 +35,8 @@ salomeinclude_HEADERS = CppUnitTest.hxx \ BBTreeTest.hxx \ RemapperTest.hxx \ SingleElementPlanarTests.hxx \ - MultiElementPlanarTests.hxx + MultiElement2DTests.hxx \ + InterpolationPlanarTestSuite.hxx EXTRA_DIST += BasicMainTest.hxx @@ -49,11 +50,12 @@ dist_libInterpKernelTest_la_SOURCES= \ libInterpKernelTest_la_CPPFLAGS= @CPPUNIT_INCLUDES@ $(MED2_INCLUDES) $(HDF5_INCLUDES) \ -I$(srcdir)/.. -I$(srcdir)/../../MEDWrapper/V2_1/Core -I$(srcdir)/../../MEDMEM -DOPTIMIZE -DLOG_LEVEL=0 -libInterpKernelTest_la_LDFLAGS= @CPPUNIT_LIBS@ +libInterpKernelTest_la_LDFLAGS= @CPPUNIT_LIBS@ ../../MEDWrapper/V2_1/Core/libmed_V2_1.la \ + ../libinterpkernel.la ../../MEDMEM/libmedmem.la -lm if MED_ENABLE_KERNEL libInterpKernelTest_la_CPPFLAGS+= ${KERNEL_CXXFLAGS} - libInterpKernelTest_la_LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace + libInterpKernelTest_la_LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace endif # Executables targets @@ -63,8 +65,8 @@ bin_PROGRAMS = TestInterpKernel \ dist_TestInterpKernel_SOURCES= TestInterpKernel.cxx dist_PerfTest_SOURCES= PerfTest.cxx -LDADD= $(MED2_LIBS) $(libInterpKernelTest_la_LDFLAGS) -lm \ - ../../MEDWrapper/V2_1/Core/libmed_V2_1.la ../libinterpkernel.la ../../MEDMEM/libmedmem.la libInterpKernelTest.la +LDADD= $(MED2_LIBS) $(libInterpKernelTest_la_LDFLAGS) \ + libInterpKernelTest.la if MED_ENABLE_KERNEL LDADD+= -lSALOMEBasics endif -- 2.39.2