From: caremoli <caremoli>
Date: Fri, 26 Oct 2007 07:17:20 +0000 (+0000)
Subject: CCAR: to be able to build without removing install directory
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7867ef12511950e0ce828611f20c90c831a87f6e;p=modules%2Fkernel.git

CCAR: to be able to build without removing install directory
---

diff --git a/src/Communication/SALOME_Communication.hxx b/src/Communication/SALOME_Communication.hxx
index c3593fbc5..93c11cc56 100755
--- a/src/Communication/SALOME_Communication.hxx
+++ b/src/Communication/SALOME_Communication.hxx
@@ -44,4 +44,4 @@
  #define COMMUNICATION_EXPORT
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am
index f844f79c6..1cf369df1 100644
--- a/src/SALOMEDS/Makefile.am
+++ b/src/SALOMEDS/Makefile.am
@@ -342,17 +342,8 @@ bin_PROGRAMS = SALOMEDS_Server SALOMEDS_Client
 
 SALOMEDS_Server_SOURCES  = SALOMEDS_Server.cxx
 SALOMEDS_Server_CPPFLAGS = $(COMMON_CPPFLAGS)
-SALOMEDS_Server_LDADD    = \
-	libSalomeDS.la $(COMMON_LIBS) \
-	../ResourcesManager/libSalomeResourcesManager.la \
-	@CAS_OCAF@ \
-	@CORBA_LIBS@
+SALOMEDS_Server_LDADD    = libSalomeDS.la 
 
 SALOMEDS_Client_SOURCES  = SALOMEDS_Client.cxx
 SALOMEDS_Client_CPPFLAGS = $(COMMON_CPPFLAGS)
-SALOMEDS_Client_LDADD    = \
-	libSalomeDS.la $(COMMON_LIBS) \
-	../ResourcesManager/libSalomeResourcesManager.la \
-	-lTKLCAF -lTKMath \
-	@CORBA_LIBS@
-
+SALOMEDS_Client_LDADD    = libSalomeDS.la 
diff --git a/src/SALOMEDS/Test/Makefile.am b/src/SALOMEDS/Test/Makefile.am
index 7c0008c99..529db807b 100644
--- a/src/SALOMEDS/Test/Makefile.am
+++ b/src/SALOMEDS/Test/Makefile.am
@@ -143,7 +143,4 @@ EXTRA_DIST = \
 bin_PROGRAMS = TestSALOMEDS
 dist_TestSALOMEDS_SOURCES  = TestSALOMEDS.cxx
 TestSALOMEDS_CPPFLAGS = $(COMMON_CPPFLAGS)
-TestSALOMEDS_LDADD    = \
-	libSALOMEDSTest.la ../libSalomeDS.la \
-	$(RPATH)/NamingService/Test/libNamingServiceTest.la \
-	$(COMMON_LIBS)
+TestSALOMEDS_LDADD    = libSALOMEDSTest.la