proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-20 07:01:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more soname= at linking

Browse Source 
Start fixing distcheck

White space cleanups


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1862 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Fabio M. Di Nitto 2009-03-18 07:52:48 +00:00
parent ae754092ca
commit cadfe03dd6
4 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
exec/Makefile.am
View File

@ -29,40 +29,47 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
# THE POSSIBILITY OF SUCH DAMAGE.
MAINTAINERCLEANFILES = Makefile.in
MAINTAINERCLEANFILES = Makefile.in
AM_CFLAGS = -fPIC
AM_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" \
-DLCRSODIR=\"${LCRSODIR}\" -DSOCKETDIR=\"${SOCKETDIR}\"
AM_CFLAGS = -fPIC
AM_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" \
-DLOCALSTATEDIR=\"${localstatedir}\" \
-DLCRSODIR=\"${LCRSODIR}\" \
-DSOCKETDIR=\"${SOCKETDIR}\"
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
LCR_SRC = objdb.c vsf_ykd.c coroparse.c quorum.c vsf_quorum.c
TOTEM_SRC = coropoll.c totemip.c totemnet.c totemrrp.c totemsrp.c totemmrp.c totempg.c crypto.c wthread.c
LOGSYS_SRC = wthread.c logsys.c
TOTEM_SRC = coropoll.c totemip.c totemnet.c totemrrp.c \
totemsrp.c totemmrp.c totempg.c crypto.c wthread.c
LOGSYS_SRC = wthread.c logsys.c
LCRSO = $(LCR_SRC:%.c=%.lcrso)
LCRSO_SRC = objdb.c vsf_ykd.c coroparse.c quorum.c vsf_quorum.c
LCRSO_OBJS = $(LCRSO_SRC:%.c=%.o)
LCRSO = $(LCRSO_SRC:%.c=%.lcrso)
lib_LIBRARIES = libtotem_pg.a liblogsys.a
sbin_PROGRAMS = corosync
SHARED_LIBS =
lib_LIBRARIES = libtotem_pg.a liblogsys.a
sbin_PROGRAMS = corosync
libtotem_pg_a_SOURCES = $(TOTEM_SRC)
liblogsys_a_SOURCES = $(LOGSYS_SRC)
corosync_SOURCES = main.c mempool.c util.c sync.c apidef.c service.c ipc.c \
timer.c totemconfig.c mainconfig.c quorum.c ../lcr/lcr_ifact.c
corosync_LDADD = -ltotem_pg -llogsys
corosync_DEPENDENCIES = libtotem_pg.so.$(SONAME) liblogsys.so.$(SONAME)
corosync_LDFLAGS = $(OS_DYFLAGS) -L./
corosync_SOURCES = main.c mempool.c util.c sync.c apidef.c service.c ipc.c \
timer.c totemconfig.c mainconfig.c quorum.c ../lcr/lcr_ifact.c
corosync_LDADD = -ltotem_pg -llogsys
corosync_DEPENDENCIES = libtotem_pg.so.$(SONAME) liblogsys.so.$(SONAME)
corosync_LDFLAGS = $(OS_DYFLAGS) -L./
TOTEM_OBJS = $(TOTEM_SRC:%.c=%.o)
LOGSYS_OBJS = $(LOGSYS_SRC:%.c=%.o)
LCRSO_OBJS = $(LCR_SRC:%.c=%.o)
TOTEM_OBJS = $(TOTEM_SRC:%.c=%.o)
LOGSYS_OBJS = $(LOGSYS_SRC:%.c=%.o)
SHARED_LIBS += $(lib_LIBRARIES:%.a=%.so.$(SONAME))
SHARED_LIBS_SO = $(SHARED_LIBS:%.so.$(SONAME)=%.so)
SHARED_LIBS_SO_TWO = $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
SHARED_LIBS = $(lib_LIBRARIES:%.a=%.so.$(SONAME))
SHARED_LIBS_SO = $(SHARED_LIBS:%.so.$(SONAME)=%.so)
SHARED_LIBS_SO_TWO = $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
noinst_HEADERS = apidef.h crypto.h ipc.h mainconfig.h main.h mempool.h \
quorum.h service.h sync.h timer.h tlist.h totemconfig.h \
totemmrp.h totemnet.h totemrrp.h totemsrp.h util.h \
version.h vsf.h wthread.h
if BUILD_DARWIN
%.lcrso: %.o
@ -77,7 +84,7 @@ liblogsys.so.$(SONAME): $(LOGSYS_OBJS)
else
%.lcrso: %.o
$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
$(CC) -shared -o $@ \
@ -92,6 +99,7 @@ liblogsys.so.$(SONAME): $(LOGSYS_OBJS)
$^ $(LDFLAGS) -lpthread
ln -sf liblogsys.so.$(SONAME) liblogsys.so
ln -sf liblogsys.so.$(SONAME) liblogsys.so.$(SOMAJOR)
endif
lint:
@ -109,5 +117,3 @@ install-exec-local:
clean-local:
rm -f corosync *.o *.lcrso gmon.out *.da *.bb *.bbg *.so*

2
include/Makefile.am
View File

@ -35,7 +35,7 @@ CS_H = hdb.h cs_config.h cpg.h cfg.h evs.h ipc_gen.h mar_gen.h swab.h \
coroipc.h confdb.h list.h corotypes.h quorum.h votequorum.h
CS_INTERNAL_H = ipc_cfg.h ipc_confdb.h ipc_cpg.h ipc_evs.h ipc_pload.h ipc_quorum.h \
jhash.h mar_cpg.h pload.h queue.h quorum.h rmd.h sq.h
jhash.h mar_cpg.h pload.h queue.h quorum.h rmd.h sq.h ipc_votequorum.h
LCR_H = lcr_ckpt.h lcr_comp.h lcr_ifact.h

5
lib/Makefile.am
View File

@ -53,6 +53,11 @@ libvotequorum_a_SOURCES = coroipc.c votequorum.c
libconfdb_a_SOURCES = coroipc.c confdb.c sa-confdb.c
libcoroipc_a_SOURCES = coroipc.c
noinst_HEADERS = sa-confdb.h util.h \
libcfg.versions libconfdb.versions \
libcoroipc.versions libcpg.versions \
libevs.versions libpload.versions \
libquorum.versions libvotequorum.versions
if BUILD_DARWIN

4
services/Makefile.am
View File

@ -50,10 +50,10 @@ service_%.lcrso: %.o
$(CC) $(CFLAGS) -bundle -bundle_loader ../exec/corosync $^ -o $@
else
quorum_%.lcrso: %.o
$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
service_%.lcrso: %.o
$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
endif
%.o: %.c