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

Fix "mock --with testagents"

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2798 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Angus Salkeld 2010-05-04 00:50:24 +00:00
parent a523bf183d
commit 1cdad3104c
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
corosync.spec.in
View File

@ -135,6 +135,10 @@ This package contains corosync test agents.
%{_datadir}/corosync/tests/mem_leak_test.sh
%{_datadir}/corosync/tests/net_breaker.sh
%{_bindir}/cpg_test_agent
%{_bindir}/confdb_test_agent
%{_bindir}/sam_test_agent
%{_bindir}/votequorum_test_agent
%{_libexecdir}/lcrso/service_syncv2.lcrso
%endif

10
cts/agents/Makefile.am
View File

@ -30,11 +30,14 @@
# THE POSSIBILITY OF SUCH DAMAGE.
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/include/corosync
SOURCES =
TEST_AGENTS = cpg_test_agent confdb_test_agent sam_test_agent votequorum_test_agent
EXTRA_DIST = syncv2.c
if INSTALL_TESTAGENTS
agentdir = $(datadir)/$(PACKAGE)/tests
bin_PROGRAMS = $(TEST_AGENTS)
@ -43,13 +46,13 @@ dist_agent_SCRIPTS = mem_leak_test.sh net_breaker.sh
AM_CFLAGS = -fPIC
SERVICE_LCRSO = syncv2
SOURCES += $(SERVICE_LCRSO:%=%.c)
EXTRA_DIST = $(SOURCES)
LCRSO = $(SERVICE_LCRSO:%=service_%.lcrso)
LCRSO_OBJS = $(SOURCES:%.c=%.o)
else
noinst_PROGRAMS = $(TEST_AGENTS)
noinst_SCRIPTS = mem_leak_test.sh net_breaker.sh
LCRSO =
LCRSO_OBJS =
endif
noinst_HEADERS = common_test_agent.h
@ -91,6 +94,9 @@ endif
if INSTALL_TESTAGENTS
syncv2.o: syncv2.c
$(CC) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
all-local: $(LCRSO_OBJS) $(LCRSO)
@echo Built Service Engines

8
lib/Makefile.am
View File

@ -112,12 +112,14 @@ libcoroipcc.so.$(SONAME): coroipcc.o
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so.$(SOMAJOR)
lib%.so: lib%.a libcoroipcc.so.$(SONAME)
if [ ! "$@" = "libcoroipcc.so" ] ; then \
$(CC) -shared -o $@.$(call get_soname,$*) \
-Wl,-soname=lib$*.so.$(call get_major,$*) \
-Wl,-version-script=$(srcdir)/lib$*.versions \
-Wl,-whole-archive $^ -Wl,-no-whole-archive $(LDFLAGS) $(AM_LDFLAGS) $(call get_linker_add,$*)
ln -sf lib$*.so.$(call get_soname,$*) lib$*.so
ln -sf lib$*.so.$(call get_soname,$*) lib$*.so.$(call get_major,$*)
-Wl,-whole-archive $^ -Wl,-no-whole-archive $(LDFLAGS) $(AM_LDFLAGS) $(call get_linker_add,$*) ;\
ln -sf lib$*.so.$(call get_soname,$*) lib$*.so ;\
ln -sf lib$*.so.$(call get_soname,$*) lib$*.so.$(call get_major,$*) ;\
fi
endif