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 c3593fbc57e92c7897799f1cc3020254d76fa788..93c11cc563be38ab210c3e739453d68e9df0e91d 100755 (executable)
--- 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 f844f79c6746d54a37ad1570ee1b968301cf0b99..1cf369df105bef82d30dc78fa90ec659907bf1a0 100644 (file)
--- 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 7c0008c99cbe82836d16ca7d9668d89931e4b356..529db807b692a114e283847e2c6a0148fcbd7b34 100644 (file)
--- 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