proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-05 16:37:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

repair OPENAIS_COVERAGE, OPENAIS_PROFILE

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@944 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Fabien Thomas 2006-03-07 22:50:50 +00:00
parent 6fdfd15c17
commit dbe3eeb295
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.inc
View File

@ -49,7 +49,10 @@ DYFLAGS =
# build CFLAGS, LDFLAGS
#
ifeq (${OPENAIS_BUILD}, RELEASE)
CFLAGS += -O3 -Wall -fomit-frame-pointer
CFLAGS += -O3 -Wall
ifndef OPENAIS_PROFILE
CFLAGS += -fomit-frame-pointer
endif
LDFLAGS +=
endif
ifeq (${OPENAIS_BUILD}, DEBUG)
@ -63,6 +66,7 @@ ifdef OPENAIS_PROFILE
endif
ifdef OPENAIS_COVERAGE
CFLAGS += -ftest-coverage -fprofile-arcs
LDFLAGS += -ftest-coverage -fprofile-arcs
endif
# platform specific CFLAGS, LDFLAGS

20
exec/Makefile
View File

@ -81,28 +81,28 @@ endif
ifeq (${OPENAIS_COMPAT}, DARWIN)
service_evs.lcrso: evs.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load evs.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load evs.o -o $@
service_clm.lcrso: clm.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load clm.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load clm.o -o $@
service_amf.lcrso: amf.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load amf.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load amf.o -o $@
service_ckpt.lcrso: ckpt.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load ckpt.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load ckpt.o -o $@
service_evt.lcrso: evt.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load evt.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load evt.o -o $@
service_lck.lcrso: lck.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load lck.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load lck.o -o $@
service_msg.lcrso: msg.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load msg.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load msg.o -o $@
service_cfg.lcrso: cfg.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load cfg.o -o $@
$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load cfg.o -o $@
service_cpg.lcrso: cpg.o
$(CC) -bundle -bundle_loader ./aisexec -bind_at_load cpg.o -o $@
@ -148,7 +148,7 @@ libtotem_pg.a: $(TOTEM_OBJS)
ifeq (${OPENAIS_COMPAT}, DARWIN)
libtotem_pg.so.1.0: $(TOTEM_OBJS)
$(CC) -bundle -bind_at_load $(TOTEM_OBJS) -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load $(TOTEM_OBJS) -o $@
rm -f libtotem_pg.so.1 libtotem_pg.so
ln -s libtotem_pg.so.1.0 libtotem_pg.so.1
ln -s libtotem_pg.so.1.0 libtotem_pg.so
@ -156,7 +156,7 @@ libtotem_pg.so.1.0: $(TOTEM_OBJS)
else
libtotem_pg.so.1.0: $(TOTEM_OBJS)
$(CC) -shared -Wl,-soname,libtotem_pg.so.1 $(TOTEM_OBJS) -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.1 $(TOTEM_OBJS) -o $@
rm -f libtotem_pg.so.1 libtotem_pg.so
ln -s libtotem_pg.so.1.0 libtotem_pg.so.1
ln -s libtotem_pg.so.1.0 libtotem_pg.so

2
exec/amfconfig.h
View File

@ -134,7 +134,7 @@ struct amf_pg_comp {
struct amf_group {
SaNameT name;
SaAmfGroupCapabilityModelT model;
SaUint32T preferred_active_units;;
SaUint32T preferred_active_units;
SaUint32T preferred_standby_units;
SaUint32T maximum_active_instances;
SaUint32T maximum_standby_instances;

32
lib/Makefile
View File

@ -50,49 +50,49 @@ libSaClm.a: util.o clm.o
ifeq (${OPENAIS_COMPAT}, DARWIN)
libSaClm.so.1.0: util.o clm.o
$(CC) -bundle -bind_at_load util.o clm.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o clm.o -o $@
rm -f libSaClm.so.1 libSaClm.so
ln -s libSaClm.so.1.0 libSaClm.so.1
ln -s libSaClm.so.1.0 libSaClm.so
libSaAmf.so.1.0: util.o amf.o
$(CC) -bundle -bind_at_load util.o amf.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o amf.o -o $@
rm -f libSaAmf.so.1 libSaAmf.so
ln -s libSaAmf.so.1.0 libSaAmf.so.1
ln -s libSaAmf.so.1.0 libSaAmf.so
libSaCkpt.so.1.0: util.o ckpt.o
$(CC) -bundle -bind_at_load util.o ckpt.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o ckpt.o -o $@
rm -f libSaCkpt.so.1 libSaCkpt.so
ln -s libSaCkpt.so.1.0 libSaCkpt.so.1
ln -s libSaCkpt.so.1.0 libSaCkpt.so
libSaEvt.so.1.0: util.o evt.o
$(CC) -bundle -bind_at_load util.o evt.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o evt.o -o $@
rm -f libSaEvt.so.1 libSaEvt.so
ln -s libSaEvt.so.1.0 libSaEvt.so.1
ln -s libSaEvt.so.1.0 libSaEvt.so
libSaLck.so.1.0: util.o lck.o
$(CC) -bundle -bind_at_load util.o lck.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o lck.o -o $@
rm -f libSaLck.so.1 libSaLck.so
ln -s libSaLck.so.1.0 libSaLck.so.1
ln -s libSaLck.so.1.0 libSaLck.so
libSaMsg.so.1.0: util.o msg.o
$(CC) -bundle -bind_at_load util.o msg.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o msg.o -o $@
rm -f libSaMsg.so.1 libSaMsg.so
ln -s libSaMsg.so.1.0 libSaMsg.so.1
ln -s libSaMsg.so.1.0 libSaMsg.so
libais.so.1.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
$(CC) -bundle -bind_at_load util.o amf.o clm.o ckpt.o evt.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o amf.o clm.o ckpt.o evt.o -o $@
rm -f libais.so.1 libais.so
ln -s libais.so.1.0 libais.so.1
ln -s libais.so.1.0 libais.so
libevs.so.1.0: util.o evs.o
$(CC) -bundle -bind_at_load util.o evs.o -o $@
$(CC) $(LDFLAGS) -bundle -bind_at_load util.o evs.o -o $@
rm -f libevs.so.1 libevs.so
ln -s libevs.so.1.0 libevs.so.1
ln -s libevs.so.1.0 libevs.so
@ -106,49 +106,49 @@ libcpg.so.1.0: util.o cpg.o
else
libSaClm.so.1.0: util.o clm.o
$(CC) -shared -Wl,-soname,libSaClm.so.1,-version-script=libSaClm.versions util.o clm.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.1,-version-script=libSaClm.versions util.o clm.o -o $@
rm -f libSaClm.so.1 libSaClm.so
ln -s libSaClm.so.1.0 libSaClm.so.1
ln -s libSaClm.so.1.0 libSaClm.so
libSaAmf.so.1.0: util.o amf.o
$(CC) -shared -Wl,-soname,libSaAmf.so.1,-version-script=libSaAmf.versions util.o amf.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaAmf.so.1,-version-script=libSaAmf.versions util.o amf.o -o $@
rm -f libSaAmf.so.1 libSaAmf.so
ln -s libSaAmf.so.1.0 libSaAmf.so.1
ln -s libSaAmf.so.1.0 libSaAmf.so
libSaCkpt.so.1.0: util.o ckpt.o
$(CC) -shared -Wl,-soname,libSaCkpt.so.1,-version-script=libSaCkpt.versions util.o ckpt.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaCkpt.so.1,-version-script=libSaCkpt.versions util.o ckpt.o -o $@
rm -f libSaCkpt.so.1 libSaCkpt.so
ln -s libSaCkpt.so.1.0 libSaCkpt.so.1
ln -s libSaCkpt.so.1.0 libSaCkpt.so
libSaEvt.so.1.0: util.o evt.o
$(CC) -shared -Wl,-soname,libSaEvt.so.1,-version-script=libSaEvt.versions util.o evt.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaEvt.so.1,-version-script=libSaEvt.versions util.o evt.o -o $@
rm -f libSaEvt.so.1 libSaEvt.so
ln -s libSaEvt.so.1.0 libSaEvt.so.1
ln -s libSaEvt.so.1.0 libSaEvt.so
libSaLck.so.1.0: util.o lck.o
$(CC) -shared -Wl,-soname,libSaLCK.so.1,-version-script=libSaLck.versions util.o lck.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaLCK.so.1,-version-script=libSaLck.versions util.o lck.o -o $@
rm -f libSaLck.so.1 libSaLck.so
ln -s libSaLck.so.1.0 libSaLck.so.1
ln -s libSaLck.so.1.0 libSaLck.so
libSaMsg.so.1.0: util.o msg.o
$(CC) -shared -Wl,-soname,libSaMsg.so.1,-version-script=libSaMsg.versions util.o msg.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaMsg.so.1,-version-script=libSaMsg.versions util.o msg.o -o $@
rm -f libSaMsg.so.1 libSaMsg.so
ln -s libSaMsg.so.1.0 libSaMsg.so.1
ln -s libSaMsg.so.1.0 libSaMsg.so
libais.so.1.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
$(CC) -shared -Wl,-soname,libais.so.1,-version-script=libSaAis.versions util.o amf.o clm.o ckpt.o evt.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libais.so.1,-version-script=libSaAis.versions util.o amf.o clm.o ckpt.o evt.o -o $@
rm -f libais.so.1 libais.so
ln -s libais.so.1.0 libais.so.1
ln -s libais.so.1.0 libais.so
libevs.so.1.0: util.o evs.o
$(CC) -shared -Wl,-soname,libevs.so.1,-version-script=libevs.versions util.o evs.o -o $@
$(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.1,-version-script=libevs.versions util.o evs.o -o $@
rm -f libevs.so.1 libevs.so
ln -s libevs.so.1.0 libevs.so.1
ln -s libevs.so.1.0 libevs.so