From 9d10db7b2f138dd71bbbce9e2912996b2c42263c Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 29 Aug 2008 13:17:16 +0000 Subject: [PATCH] Migrate to SALOME 5.x and automake --- src/GHS3DPRLPlugin/Makefile.am | 2 -- src/gui/Makefile.am | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/GHS3DPRLPlugin/Makefile.am b/src/GHS3DPRLPlugin/Makefile.am index 3b5aa6f..cafa635 100644 --- a/src/GHS3DPRLPlugin/Makefile.am +++ b/src/GHS3DPRLPlugin/Makefile.am @@ -48,7 +48,6 @@ libGHS3DPRLEngine_la_CPPFLAGS = \ $(MED_CXXFLAGS) \ $(GEOM_CXXFLAGS) \ $(CAS_CPPFLAGS) \ - $(GHS3DPRL_INCLUDES) \ $(SMESH_CXXFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ @@ -58,6 +57,5 @@ libGHS3DPRLEngine_la_CPPFLAGS = \ libGHS3DPRLEngine_la_LDFLAGS = \ ../../idl/libSalomeIDLGHS3DPRLPLUGIN.la \ - $(GHS3DPRL_LIBS) \ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine \ $(KERNEL_LDFLAGS) -lSalomeGenericObj diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 4c5253d..185164e 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -56,15 +56,14 @@ libGHS3DPRLPluginGUI_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ - $(GHS3DPRL_INCLUDES) \ -I$(srcdir)/../GHS3DPRLPlugin \ -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libGHS3DPRLPluginGUI_la_LDFLAGS = \ +libGHS3DPRLPluginGUI_la_LDFLAGS = \ ../GHS3DPRLPlugin/libGHS3DPRLEngine.la \ ${SMESH_LDFLAGS} -lSMESH \ - $(CAS_KERNEL) $(GHS3DPRL_LIBS) + $(CAS_KERNEL) # resources files nodist_salomeres_DATA = \ -- 2.39.2