Patch from Kacper Kowalik to support honoring user defined LDFLAGS.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@3042 fd59a12c-fef9-0310-b244-a6a79926bd2f

cts/agents/Makefile.am

@@ -76,7 +76,7 @@ votequorum_test_agent_LDFLAGS =  -L../../lib
 if BUILD_DARWIN
 
 service_%.lcrso: %.o
-	$(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bundle_loader $(top_builddir)/exec/corosync $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bundle_loader $(top_builddir)/exec/corosync $^ -o $@
 
 else
 if BUILD_SOLARIS
@@ -87,7 +87,7 @@ service_%.lcrso: %.o
 else
 
 service_%.lcrso: %.o
-	$(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 endif
 endif
 

exec/Makefile.am

@@ -81,7 +81,7 @@ EXTRA_DIST		= $(LCRSO_SRC)
 
 if BUILD_DARWIN
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ -lpthread
@@ -102,46 +102,46 @@ else
 
 if BUILD_SOLARIS
 %.lcrso: %.o
-	$(LD) -G $^ -o $@
+	$(LD) $(LDFLAGS) -G $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
-	$(LD) -G $(TOTEM_OBJS) -o $@ -lpthread
+	$(LD) $(LDFLAGS) -G $(TOTEM_OBJS) -o $@ -lpthread
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so.$(SOMAJOR)
 
 liblogsys.so.$(SONAME): $(LOGSYS_OBJS)
-	$(LD) -G $(LOGSYS_OBJS) -o $@ -lpthread
+	$(LD) $(LDFLAGS) -G $(LOGSYS_OBJS) -o $@ -lpthread
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so.$(SOMAJOR)
 
 libcoroipcs.so.$(SONAME): $(COROIPCS_OBJS)
-	$(LD) -G $(COROIPCS_OBJS) -o $@ -lpthread
+	$(LD) $(LDFLAGS) -G $(COROIPCS_OBJS) -o $@ -lpthread
 	ln -sf libcoroipcs.so.$(SONAME) libcoroipcs.so
 	ln -sf libcoroipcs.so.$(SONAME) libcoroipcs.so.$(SOMAJOR)
 
 else
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	$(CC) -shared -o $@ \
 		-Wl,-soname=libtotem_pg.so.$(SOMAJOR) \
-		$^ $(LDFLAGS) $(nss_LIBS) $(rdmacm_LIBS) $(ibverbs_LIBS) -lpthread
+		$(LDFLAGS) $^ $(nss_LIBS) $(rdmacm_LIBS) $(ibverbs_LIBS) -lpthread
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so.$(SOMAJOR)
 
 liblogsys.so.$(SONAME): $(LOGSYS_OBJS)
 	$(CC) -shared -o $@ \
 		-Wl,-soname=liblogsys.so.$(SOMAJOR) \
-		$^ $(LDFLAGS) -lpthread
+		$(LDFLAGS) $^ -lpthread
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so.$(SOMAJOR)
 
 libcoroipcs.so.$(SONAME): $(COROIPCS_OBJS)
 	$(CC) -shared -o $@ \
 		-Wl,-soname=libcoroipcs.so.$(SOMAJOR) \
-		$^ $(LDFLAGS) -lpthread
+		$(LDFLAGS) $^ -lpthread
 	ln -sf libcoroipcs.so.$(SONAME) libcoroipcs.so
 	ln -sf libcoroipcs.so.$(SONAME) libcoroipcs.so.$(SOMAJOR)
 

lcr/Makefile.am

@@ -52,17 +52,17 @@ test_static_SOURCES	= test.c libtest_a.c libtest_b.c uis.c lcr_ifact.c
 if BUILD_DARWIN
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
 else
 
 if BUILD_SOLARIS
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -shared $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -shared $^ -o $@
 else
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
 
 endif
 

lib/Makefile.am

@@ -108,7 +108,7 @@ libcoroipcc.so.$(SONAME): coroipcc.o
 	$(CC) -shared -o $@ \
 		-Wl,-soname=libcoroipcc.so.$(SOMAJOR) \
 		-Wl,-version-script=$(srcdir)/libcoroipcc.versions \
-		$^ $(LDFLAGS) $(AM_LDFLAGS)
+		$(LDFLAGS) $^ $(AM_LDFLAGS)
 	ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so
 	ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so.$(SOMAJOR)
 

services/Makefile.am

@@ -51,10 +51,10 @@ LCRSO_OBJS		= $(SOURCES:%.c=%.o)
 
 if BUILD_DARWIN
 quorum_%.lcrso: %.o
-	$(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bundle_loader $(top_builddir)/exec/corosync $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bundle_loader $(top_builddir)/exec/corosync $^ -o $@
 
 service_%.lcrso: %.o
-	$(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bundle_loader $(top_builddir)/exec/corosync $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bundle_loader $(top_builddir)/exec/corosync $^ -o $@
 
 else
 
@@ -68,10 +68,10 @@ service_%.lcrso: %.o
 
 else
 quorum_%.lcrso: %.o
-	$(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 service_%.lcrso: %.o
-	$(CC) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) $(COVERAGE_LCRSO_EXTRA_LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 endif
 
 endif