From 49b22b1c40b88469c8f2dace3fcb278dd83528a9 Mon Sep 17 00:00:00 2001 From: jrt Date: Thu, 4 Sep 2003 11:03:54 +0000 Subject: [PATCH] Remove OCC_LIBS from LDFLAGS --- src/DriverDAT/Makefile.in | 2 +- src/DriverMED/Makefile.in | 11 ++++++++--- src/DriverUNV/Makefile.in | 11 ++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/DriverDAT/Makefile.in b/src/DriverDAT/Makefile.in index bb5774f7a..cf3dba921 100644 --- a/src/DriverDAT/Makefile.in +++ b/src/DriverDAT/Makefile.in @@ -48,7 +48,7 @@ LIB_SERVER_IDL = # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(MED2_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) $(MED2_LIBS) -lMeshDriver +LDFLAGS += $(MED2_LIBS) -lMeshDriver %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/DriverMED/Makefile.in b/src/DriverMED/Makefile.in index 517ee953b..4217426f5 100644 --- a/src/DriverMED/Makefile.in +++ b/src/DriverMED/Makefile.in @@ -39,16 +39,21 @@ EXPORT_HEADERS= DriverMED_R_SMDS_Mesh.h DriverMED_R_SMESHDS_Mesh.h DriverMED_R_S # Libraries targets LIB = libMeshDriverMED.la -LIB_SRC = DriverMED_R_SMDS_Mesh.cxx DriverMED_R_SMESHDS_Mesh.cxx DriverMED_R_SMESHDS_Document.cxx DriverMED_W_SMDS_Mesh.cxx DriverMED_W_SMESHDS_Mesh.cxx DriverMED_W_SMESHDS_Document.cxx +LIB_SRC = \ + DriverMED_R_SMDS_Mesh.cxx \ + DriverMED_R_SMESHDS_Mesh.cxx \ + DriverMED_R_SMESHDS_Document.cxx \ + DriverMED_W_SMDS_Mesh.cxx \ + DriverMED_W_SMESHDS_Document.cxx \ + DriverMED_W_SMESHDS_Mesh.cxx LIB_CLIENT_IDL = - LIB_SERVER_IDL = # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(MED2_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) $(MED2_LIBS) -lMeshDriver -lmed +LDFLAGS += $(MED2_LIBS) -lMeshDriver -lmed %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/DriverUNV/Makefile.in b/src/DriverUNV/Makefile.in index 4551caf44..cfb048787 100644 --- a/src/DriverUNV/Makefile.in +++ b/src/DriverUNV/Makefile.in @@ -40,8 +40,13 @@ EXPORT_HEADERS= DriverUNV_R_SMDS_Mesh.h DriverUNV_R_SMESHDS_Mesh.h DriverUNV_R_S # Libraries targets LIB = libMeshDriverUNV.la -LIB_SRC = DriverUNV_R_SMDS_Mesh.cxx DriverUNV_R_SMESHDS_Mesh.cxx DriverUNV_R_SMESHDS_Document.cxx \ - DriverUNV_W_SMDS_Mesh.cxx DriverUNV_W_SMESHDS_Mesh.cxx DriverUNV_W_SMESHDS_Document.cxx +LIB_SRC = \ + DriverUNV_R_SMDS_Mesh.cxx \ + DriverUNV_R_SMESHDS_Mesh.cxx \ + DriverUNV_R_SMESHDS_Document.cxx \ + DriverUNV_W_SMESHDS_Document.cxx \ + DriverUNV_W_SMDS_Mesh.cxx \ + DriverUNV_W_SMESHDS_Mesh.cxx LIB_CLIENT_IDL = @@ -50,7 +55,7 @@ LIB_SERVER_IDL = # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(MED2_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) $(MED2_LIBS) -lMeshDriver +LDFLAGS += $(MED2_LIBS) -lMeshDriver %_moc.cxx: %.h $(MOC) $< -o $@ -- 2.30.2