? NETGENPLUGIN_SRC_3.2.2/aclocal.m4 ? NETGENPLUGIN_SRC_3.2.2/autom4te.cache ? NETGENPLUGIN_SRC_3.2.2/configure ? NETGENPLUGIN_SRC_3.2.2/configure.in ? NETGENPLUGIN_SRC_3.2.2/configure.in_new ? NETGENPLUGIN_SRC_3.2.2/configure.in_old Index: NETGENPLUGIN_SRC_3.2.2/configure.in.base =================================================================== RCS file: /home/server/cvs/NETGENPLUGIN/NETGENPLUGIN_SRC_3.2.2/configure.in.base,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -c -u -r1.5.2.3 -r1.5.2.4 --- NETGENPLUGIN_SRC_3.2.2/configure.in.base 25 Aug 2006 07:09:10 -0000 1.5.2.3 +++ NETGENPLUGIN_SRC_3.2.2/configure.in.base 29 Sep 2006 16:12:24 -0000 1.5.2.4 @@ -360,7 +360,7 @@ fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl do # if test ! -d $rep ; then # eval mkdir $rep Index: NETGENPLUGIN_SRC_3.2.2/adm_local/unix/make_commence.in =================================================================== RCS file: /home/server/cvs/NETGENPLUGIN/NETGENPLUGIN_SRC_3.2.2/adm_local/unix/make_commence.in,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -c -u -r1.6.4.1 -r1.6.4.2 --- NETGENPLUGIN_SRC_3.2.2/adm_local/unix/make_commence.in 27 Jun 2006 07:45:55 -0000 1.6.4.1 +++ NETGENPLUGIN_SRC_3.2.2/adm_local/unix/make_commence.in 29 Sep 2006 16:12:45 -0000 1.6.4.2 @@ -12,7 +12,7 @@ LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ @@ -175,7 +175,7 @@ CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS) CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES) -LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib/salome -L${SMESH_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj +LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${SMESH_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${GEOM_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lSalomeGenericObj # add corba libs when link salome application ! #LDFLAGS+= $(CORBA_LIBS) @@ -205,7 +205,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@/salome -libdir=@libdir@/salome +libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome Index: NETGENPLUGIN_SRC_3.2.2/idl/Makefile.in =================================================================== RCS file: /home/server/cvs/NETGENPLUGIN/NETGENPLUGIN_SRC_3.2.2/idl/Makefile.in,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -c -u -r1.3 -r1.3.2.1 --- NETGENPLUGIN_SRC_3.2.2/idl/Makefile.in 1 Jun 2006 11:42:55 -0000 1.3 +++ NETGENPLUGIN_SRC_3.2.2/idl/Makefile.in 29 Sep 2006 16:13:16 -0000 1.3.2.1 @@ -46,7 +46,7 @@ # python wrap lib: pyidl -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ +PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) Index: NETGENPLUGIN_SRC_3.2.2/src/GUI/Makefile.in =================================================================== RCS file: /home/server/cvs/NETGENPLUGIN/NETGENPLUGIN_SRC_3.2.2/src/GUI/Makefile.in,v retrieving revision 1.3 retrieving revision 1.3.2.2 diff -c -u -r1.3 -r1.3.2.2 --- NETGENPLUGIN_SRC_3.2.2/src/GUI/Makefile.in 1 Jun 2006 11:42:55 -0000 1.3 +++ NETGENPLUGIN_SRC_3.2.2/src/GUI/Makefile.in 11 Oct 2006 05:09:27 -0000 1.3.2.2 @@ -67,8 +67,7 @@ CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ -I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome -LDFLAGS += -lSMESH $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome \ - -L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome \ - -L${SMESH_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) ${GEOM_LDFLAGS} ${SMESH_LDFLAGS} -lSMESH + @CONCLUDE@ Index: NETGENPLUGIN_SRC_3.2.2/src/NETGEN/netgen45ForSalome.patch =================================================================== RCS file: /home/server/cvs/NETGENPLUGIN/NETGENPLUGIN_SRC_3.2.2/src/NETGEN/netgen45ForSalome.patch,v retrieving revision 1.2 diff -c -u -r1.2 netgen45ForSalome.patch --- NETGENPLUGIN_SRC_3.2.2/src/NETGEN/netgen45ForSalome.patch 6 May 2006 08:54:13 -0000 1.2 +++ NETGENPLUGIN_SRC_3.2.2/src/NETGEN/netgen45ForSalome.patch 24 Oct 2006 08:10:26 -0000 @@ -42,7 +42,7 @@ include $(LIBSRC_DIR)/makefile.mach.$(MACHINE) # -CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -+CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \ ++CPLUSPLUSFLAGS1 = -c -fPIC -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \ + -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS # ARFLAGS = r Index: NETGENPLUGIN_SRC_3.2.2/src/NETGENPlugin/Makefile.in =================================================================== RCS file: /home/server/cvs/NETGENPLUGIN/NETGENPLUGIN_SRC_3.2.2/src/NETGENPlugin/Makefile.in,v retrieving revision 1.3 retrieving revision 1.3.2.2 diff -c -u -r1.3 -r1.3.2.2 --- NETGENPLUGIN_SRC_3.2.2/src/NETGENPlugin/Makefile.in 1 Jun 2006 11:42:55 -0000 1.3 +++ NETGENPLUGIN_SRC_3.2.2/src/NETGENPlugin/Makefile.in 29 Sep 2006 16:13:59 -0000 1.3.2.2 @@ -52,6 +52,9 @@ LIB_CLIENT_IDL = \ SALOME_Component.idl \ SALOME_Comm.idl \ + SALOME_Exception.idl \ + SALOME_GenericObj.idl \ + SMESH_Hypothesis.idl \ GEOM_Gen.idl \ MED.idl @@ -61,6 +64,6 @@ NETGEN_INCLUDES = @NETGEN_INCLUDES@ CPPFLAGS += $(NETGEN_INCLUDES) CXXFLAGS += $(NETGEN_INCLUDES) -LDFLAGS += -lNETGEN +LDFLAGS += -L${NETGENPLUGIN_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lNETGEN @CONCLUDE@