--- src/tools/Makefile.am.link	2010-04-19 12:42:25.000000000 +0200
+++ src/tools/Makefile.am	2010-04-19 12:43:13.000000000 +0200
@@ -51,28 +51,28 @@
 
 pki_tool_SOURCES = $(PKI_TOOL)
 pki_tool_CPPFLAGS = $(BUILD_LIBPKI_CFLAGS)
-pki_tool_LDADD = $(MYLDADD) 
-pki_tool_LDFLAGS = $(MYLDFLAGS) $(BUILD_LIBPKI_LIBS)
+pki_tool_LDADD = $(MYLDADD) $(BUILD_LIBPKI_LIBS)
+pki_tool_LDFLAGS = $(MYLDFLAGS)
 
 url_tool_SOURCES = $(URL_TOOL)
 url_tool_CPPFLAGS = $(BUILD_LIBPKI_CFLAGS)
-url_tool_LDADD = $(MYLDADD)
-url_tool_LDFLAGS = $(BUILD_LIBPKI_LIBS) $(MYLDFLAGS)
+url_tool_LDADD = $(MYLDADD) $(BUILD_LIBPKI_LIBS)
+url_tool_LDFLAGS = $(MYLDFLAGS)
 
 pki_xpair_SOURCES = $(XPAIR_TOOL)
 pki_xpair_CPPFLAGS = $(BUILD_LIBPKI_CFLAGS)
-pki_xpair_LDADD = $(MYLDADD) 
-pki_xpair_LDFLAGS = $(BUILD_LIBPKI_LIBS) $(MYLDFLAGS)
+pki_xpair_LDADD = $(MYLDADD) $(BUILD_LIBPKI_LIBS)
+pki_xpair_LDFLAGS = $(MYLDFLAGS)
 
 pki_query_SOURCES = $(PRQP_TOOL)
 pki_query_CPPFLAGS = $(BUILD_LIBPKI_CFLAGS)
-pki_query_LDADD = $(MYLDADD)
-pki_query_LDFLAGS = $(BUILD_LIBPKI_LIBS) $(MYLDFLAGS)
+pki_query_LDADD = $(MYLDADD) $(BUILD_LIBPKI_LIBS)
+pki_query_LDFLAGS = $(MYLDFLAGS)
 
 pki_request_SOURCES = $(REQUEST_TOOL)
 pki_request_CPPFLAGS = $(BUILD_LIBPKI_CFLAGS)
-pki_request_LDADD = $(MYLDADD)
-pki_request_LDFLAGS = $(MYLDFLAGS) $(BUILD_LIBPKI_LIBS)
+pki_request_LDADD = $(MYLDADD) $(BUILD_LIBPKI_LIBS)
+pki_request_LDFLAGS = $(MYLDFLAGS)
 
 # scep_SOURCES = $(SCEP_TOOL)
 # scep_CPPFLAGS = $(BUILD_LIBPKI_CFLAGS)