Page MenuHomeClusterLabs Projects
Files F4624523

No OneTemporary
Actions

View Options

diff --git a/lrmd/Makefile.am b/lrmd/Makefile.am
index 5846503276..18ad848f11 100644
--- a/lrmd/Makefile.am
+++ b/lrmd/Makefile.am
@@ -1,68 +1,68 @@
# Copyright (c) 2012 David Vossel <davidvossel@gmail.com>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
include $(top_srcdir)/Makefile.common
testdir = $(datadir)/$(PACKAGE)/tests/lrmd
test_SCRIPTS = regression.py
lrmdlibdir = $(CRM_DAEMON_DIR)
lrmdlib_PROGRAMS = lrmd lrmd_test lrmd_internal_ctl
initdir = $(INITDIR)
init_SCRIPTS = pacemaker_remote
sbin_PROGRAMS = pacemaker_remoted
if BUILD_SYSTEMD
systemdunit_DATA = pacemaker_remote.service
endif
lrmd_CFLAGS = $(CFLAGS_HARDENED_EXE)
lrmd_LDFLAGS = $(LDFLAGS_HARDENED_EXE)
lrmd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
$(top_builddir)/lib/services/libcrmservice.la \
- $(top_builddir)/lib/lrmd/liblrmd.la \
$(top_builddir)/lib/fencing/libstonithd.la ${COMPAT_LIBS}
lrmd_SOURCES = main.c lrmd.c
pacemaker_remoted_CPPFLAGS = -DSUPPORT_REMOTE $(AM_CPPFLAGS)
pacemaker_remoted_CFLAGS = $(CFLAGS_HARDENED_EXE)
pacemaker_remoted_LDFLAGS = $(LDFLAGS_HARDENED_EXE)
-pacemaker_remoted_LDADD = $(lrmd_LDADD)
+pacemaker_remoted_LDADD = $(lrmd_LDADD) \
+ $(top_builddir)/lib/lrmd/liblrmd.la
pacemaker_remoted_SOURCES = main.c lrmd.c tls_backend.c ipc_proxy.c
lrmd_internal_ctl_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
$(top_builddir)/lib/lrmd/liblrmd.la \
$(top_builddir)/lib/cib/libcib.la \
$(top_builddir)/lib/services/libcrmservice.la \
$(top_builddir)/lib/pengine/libpe_status.la \
$(top_builddir)/pengine/libpengine.la
lrmd_internal_ctl_SOURCES = remote_ctl.c
lrmd_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
$(top_builddir)/lib/lrmd/liblrmd.la \
$(top_builddir)/lib/cib/libcib.la \
$(top_builddir)/lib/services/libcrmservice.la \
$(top_builddir)/lib/pengine/libpe_status.la \
$(top_builddir)/pengine/libpengine.la
lrmd_test_SOURCES = test.c
noinst_HEADERS = lrmd_private.h
CLEANFILES = $(man8_MANS)
diff --git a/pengine/Makefile.am b/pengine/Makefile.am
index d4dbfb914b..4cea04375a 100644
--- a/pengine/Makefile.am
+++ b/pengine/Makefile.am
@@ -1,90 +1,90 @@
#
# Copyright (C) 2004 Andrew Beekhof
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
halibdir = $(CRM_DAEMON_DIR)
PE_TESTS = $(wildcard test10/*.scores)
testdir = $(datadir)/$(PACKAGE)/tests/pengine
test_SCRIPTS = regression.sh
test_DATA = regression.core.sh
test10dir = $(datadir)/$(PACKAGE)/tests/pengine/test10
test10_DATA = $(PE_TESTS) $(PE_TESTS:%.scores=%.xml) $(PE_TESTS:%.scores=%.exp) $(PE_TESTS:%.scores=%.dot) $(PE_TESTS:%.scores=%.summary) $(wildcard test10/*.stderr)
COMMONLIBS = $(top_builddir)/lib/common/libcrmcommon.la \
$(top_builddir)/lib/pengine/libpe_status.la \
- libpengine.la $(CURSESLIBS) $(CLUSTERLIBS)
+ libpengine.la
beekhof:
echo $(shell ls -1 test10/*.xml)
#TESTS = test10/*.xml
TESTS = test10/bug-rh-1097457.xml
TEST_EXTENSIONS = .xml
XML_LOG_COMPILER = ./regression.sh
AM_XML_LOG_FLAGS = -V --run
#LOG_COMPILER =
#AM_LOG_FLAGS = -V
## libraries
lib_LTLIBRARIES = libpengine.la
## binary progs
halib_PROGRAMS = pengine
if BUILD_XML_HELP
man7_MANS = pengine.7
endif
## SOURCES
noinst_HEADERS = allocate.h utils.h pengine.h
libpengine_la_LDFLAGS = -version-info 11:0:1
libpengine_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
libpengine_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la \
$(top_builddir)/lib/cib/libcib.la
# -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
libpengine_la_SOURCES = pengine.c allocate.c utils.c constraints.c
libpengine_la_SOURCES += native.c group.c clone.c master.c graph.c utilization.c
pengine_CFLAGS = $(CFLAGS_HARDENED_EXE)
pengine_LDFLAGS = $(LDFLAGS_HARDENED_EXE)
pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
# libcib for get_object_root()
# $(top_builddir)/lib/hbclient/libhbclient.la
pengine_SOURCES = main.c
install-exec-local:
$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
-chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)
-chgrp $(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
-chmod 750 $(DESTDIR)/$(PE_STATE_DIR)
uninstall-local:
clean-local:
rm -f test10/*.pe.* $(man7_MANS)

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jul 8, 6:30 PM (7 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2002671
Default Alt Text
(5 KB)

Event Timeline