diff --git a/samples/rm_amqp/rm_echo_dual_1_0/Makefile.am b/samples/rm_amqp/rm_echo_dual_1_0/Makefile.am
index e42ee45..486df9b 100644
--- a/samples/rm_amqp/rm_echo_dual_1_0/Makefile.am
+++ b/samples/rm_amqp/rm_echo_dual_1_0/Makefile.am
@@ -10,7 +10,7 @@
 						 -laxis2_engine \
 						 -laxis2_parser \
 						 -lpthread \
-						 -lsandesha2_client \
+						 ../../../src/client/libsandesha2_client.la \
 						 $(GUTHTHILA_LIBS) \
 						 $(LIBXML2_LIBS)
 
diff --git a/samples/rm_amqp/rm_echo_dual_1_1/Makefile.am b/samples/rm_amqp/rm_echo_dual_1_1/Makefile.am
index 9c0a8a2..f0fb542 100644
--- a/samples/rm_amqp/rm_echo_dual_1_1/Makefile.am
+++ b/samples/rm_amqp/rm_echo_dual_1_1/Makefile.am
@@ -10,7 +10,7 @@
                     	 -laxis2_engine \
                     	 -laxis2_parser \
                     	 -lpthread \
-                    	 -lsandesha2_client \
+                    	 ../../../src/client/libsandesha2_client.la \
                     	 $(GUTHTHILA_LIBS) \
                     	 $(LIBXML2_LIBS)
 
diff --git a/samples/rm_amqp/rm_echo_single_1_0/Makefile.am b/samples/rm_amqp/rm_echo_single_1_0/Makefile.am
index b1b9d69..398b809 100644
--- a/samples/rm_amqp/rm_echo_single_1_0/Makefile.am
+++ b/samples/rm_amqp/rm_echo_single_1_0/Makefile.am
@@ -10,7 +10,7 @@
                     	   -laxis2_engine \
                     	   -laxis2_parser \
                     	   -lpthread \
-                    	   -lsandesha2_client \
+                    	   ../../../src/client/libsandesha2_client.la \
                     	   $(GUTHTHILA_LIBS) \
                     	   $(LIBXML2_LIBS)
 
diff --git a/samples/rm_amqp/rm_echo_single_1_1/Makefile.am b/samples/rm_amqp/rm_echo_single_1_1/Makefile.am
index 4ef2141..38cd799 100644
--- a/samples/rm_amqp/rm_echo_single_1_1/Makefile.am
+++ b/samples/rm_amqp/rm_echo_single_1_1/Makefile.am
@@ -10,7 +10,7 @@
                     	   -laxis2_engine \
                     	   -laxis2_parser \
                     	   -lpthread \
-                    	   -lsandesha2_client \
+                    	   ../../../src/client/libsandesha2_client.la \
                     	   $(GUTHTHILA_LIBS) \
                     	   $(LIBXML2_LIBS)
 
diff --git a/samples/rm_amqp/rm_mtom_1_0/Makefile.am b/samples/rm_amqp/rm_mtom_1_0/Makefile.am
index 2b020ee..0e5247c 100644
--- a/samples/rm_amqp/rm_mtom_1_0/Makefile.am
+++ b/samples/rm_amqp/rm_mtom_1_0/Makefile.am
@@ -10,7 +10,7 @@
                     -laxis2_engine \
                     -laxis2_parser \
                     -lpthread \
-                    -lsandesha2_client \
+                    ../../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_amqp/rm_ping_1_0/Makefile.am b/samples/rm_amqp/rm_ping_1_0/Makefile.am
index 3a7dcc4..b9ce3fd 100644
--- a/samples/rm_amqp/rm_ping_1_0/Makefile.am
+++ b/samples/rm_amqp/rm_ping_1_0/Makefile.am
@@ -10,7 +10,7 @@
                     -laxis2_engine \
                     -laxis2_parser \
                     -lpthread \
-                    -lsandesha2_client \
+                    ../../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_amqp/rm_ping_1_1/Makefile.am b/samples/rm_amqp/rm_ping_1_1/Makefile.am
index 6033d9b..53322da 100644
--- a/samples/rm_amqp/rm_ping_1_1/Makefile.am
+++ b/samples/rm_amqp/rm_ping_1_1/Makefile.am
@@ -10,7 +10,7 @@
                     -laxis2_engine \
                     -laxis2_parser \
                     -lpthread \
-                    -lsandesha2_client \
+                    ../../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_1_0/Makefile.am b/samples/rm_echo_1_0/Makefile.am
index 2a50120..6635ecb 100644
--- a/samples/rm_echo_1_0/Makefile.am
+++ b/samples/rm_echo_1_0/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_1_0_large_sequence/Makefile.am b/samples/rm_echo_1_0_large_sequence/Makefile.am
index b02b79c..81cbb4a 100644
--- a/samples/rm_echo_1_0_large_sequence/Makefile.am
+++ b/samples/rm_echo_1_0_large_sequence/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_1_1/Makefile.am b/samples/rm_echo_1_1/Makefile.am
index 9d9dccd..7f4f845 100644
--- a/samples/rm_echo_1_1/Makefile.am
+++ b/samples/rm_echo_1_1/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_1_1_large_sequence/Makefile.am b/samples/rm_echo_1_1_large_sequence/Makefile.am
index fd237c6..967f5c8 100644
--- a/samples/rm_echo_1_1_large_sequence/Makefile.am
+++ b/samples/rm_echo_1_1_large_sequence/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_single_1_0/Makefile.am b/samples/rm_echo_single_1_0/Makefile.am
index 968ede7..5c9667d 100644
--- a/samples/rm_echo_single_1_0/Makefile.am
+++ b/samples/rm_echo_single_1_0/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_single_1_0_large_sequence/Makefile.am b/samples/rm_echo_single_1_0_large_sequence/Makefile.am
index 7c4e03d..39f8980 100644
--- a/samples/rm_echo_single_1_0_large_sequence/Makefile.am
+++ b/samples/rm_echo_single_1_0_large_sequence/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_single_1_1/Makefile.am b/samples/rm_echo_single_1_1/Makefile.am
index 22c0e02..65584cc 100644
--- a/samples/rm_echo_single_1_1/Makefile.am
+++ b/samples/rm_echo_single_1_1/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_echo_single_1_1_large_sequence/Makefile.am b/samples/rm_echo_single_1_1_large_sequence/Makefile.am
index 37761bb..cfce672 100644
--- a/samples/rm_echo_single_1_1_large_sequence/Makefile.am
+++ b/samples/rm_echo_single_1_1_large_sequence/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_mtom_1_0/Makefile.am b/samples/rm_mtom_1_0/Makefile.am
index b7ee2fb..89e0e91 100644
--- a/samples/rm_mtom_1_0/Makefile.am
+++ b/samples/rm_mtom_1_0/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_ping_1_0/Makefile.am b/samples/rm_ping_1_0/Makefile.am
index 93b4d99..b12d36c 100644
--- a/samples/rm_ping_1_0/Makefile.am
+++ b/samples/rm_ping_1_0/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_ping_1_0_large_sequence/Makefile.am b/samples/rm_ping_1_0_large_sequence/Makefile.am
index 85b1c51..b272ae2 100644
--- a/samples/rm_ping_1_0_large_sequence/Makefile.am
+++ b/samples/rm_ping_1_0_large_sequence/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_ping_1_1/Makefile.am b/samples/rm_ping_1_1/Makefile.am
index 3844a66..0954f1e 100644
--- a/samples/rm_ping_1_1/Makefile.am
+++ b/samples/rm_ping_1_1/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)
 
diff --git a/samples/rm_ping_1_1_large_sequence/Makefile.am b/samples/rm_ping_1_1_large_sequence/Makefile.am
index 1d9de9f..3b8a903 100644
--- a/samples/rm_ping_1_1_large_sequence/Makefile.am
+++ b/samples/rm_ping_1_1_large_sequence/Makefile.am
@@ -11,7 +11,7 @@
                     -lpthread \
                     -laxis2_http_sender \
                     -laxis2_http_receiver \
-                    -lsandesha2_client \
+                    ../../src/client/libsandesha2_client.la \
                     $(GUTHTHILA_LIBS) \
                     $(LIBXML2_LIBS)