From 229c1837b54272a6cd9f6b49d7f286dd732e1d65 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Wed, 11 Mar 2009 12:30:52 +0000 Subject: [PATCH] Fix library linking git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1838 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/Makefile.am | 8 ++++---- lib/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exec/Makefile.am b/exec/Makefile.am index 08954463..bc4ad645 100644 --- a/exec/Makefile.am +++ b/exec/Makefile.am @@ -70,10 +70,10 @@ if BUILD_DARWIN $(CC) $(CFLAGS) -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@ libtotem_pg.so.$(SONAME): $(TOTEM_OBJS) - $(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ + $(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ -lpthread liblogsys.so.$(SONAME): $(LOGSYS_OBJS) - $(CC) $(LDFLAGS) $(DARWIN_OPTS) $(LOGSYS_OBJS) -o $@ + $(CC) $(LDFLAGS) $(DARWIN_OPTS) $(LOGSYS_OBJS) -o $@ -lpthread else @@ -81,12 +81,12 @@ else $(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@ libtotem_pg.so.$(SONAME): $(TOTEM_OBJS) - $(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.$(SOMAJOR) $^ -o $@ + $(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.$(SOMAJOR) $^ -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) - $(CC) $(LDFLAGS) -shared -Wl,-soname,liblogsys.so.$(SOMAJOR) $^ -o $@ + $(CC) $(LDFLAGS) -shared -Wl,-soname,liblogsys.so.$(SOMAJOR) $^ -o $@ -lpthread ln -sf liblogsys.so.$(SONAME) liblogsys.so ln -sf liblogsys.so.$(SONAME) liblogsys.so.$(SOMAJOR) endif diff --git a/lib/Makefile.am b/lib/Makefile.am index c9a3586b..0a8ed32a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -57,7 +57,7 @@ libcoroipc.so.$(SONAME): coroipc.o $(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o -o $@ libconfdb.so.$(SONAME): coroipc.o confdb.o sa-confdb.o - $(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ + $(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ -ldl lib%.so.$(SONAME): coroipc.o %.o $(CC) $(DARWIN_OPTS) $^ -o $@ @@ -70,7 +70,7 @@ libcoroipc.so.$(SONAME): coroipc.o ln -sf libcoroipc.so.$(SONAME) libcoroipc.so.$(SOMAJOR) libconfdb.so.$(SONAME): coroipc.o confdb.o sa-confdb.o - $(CC) $(LDFLAGS) $(DYFLAGS) -shared -Wl,-soname,libconfdb.so.$(SOMAJOR),-version-script=$(srcdir)/libconfdb.versions coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ + $(CC) $(LDFLAGS) $(DYFLAGS) -shared -Wl,-soname,libconfdb.so.$(SOMAJOR),-version-script=$(srcdir)/libconfdb.versions coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ -ldl ln -sf libconfdb.so.$(SONAME) libconfdb.so ln -sf libconfdb.so.$(SONAME) libconfdb.so.$(SOMAJOR)