diff --git a/Makefile.am b/Makefile.am
index 2b18dc3865..874f6ed072 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,81 +1,83 @@
#
# Pacemaker code
#
# 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.
#
EXTRA_DIST = autogen.sh ConfigureMe README.in m4/gnulib-cache.m4
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
DRF/stamp-h.in libtool.m4 ltdl.m4
CORE = replace include lib mcp attrd pengine cib crmd fencing lrmd tools xml
SUBDIRS = $(CORE) extra doc
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
doc_DATA = README.markdown COPYING
ACLOCAL_AMFLAGS = -I m4
licensedir = $(docdir)/licenses/
license_DATA = $(wildcard licenses/*)
# Test components
SUBDIRS += cts
testdir = $(datadir)/$(PACKAGE)/tests/
test_SCRIPTS = coverage.sh BasicSanity.sh
test_DATA = valgrind-pcmk.suppressions
# Scratch file for ad-hoc testing
noinst_PROGRAMS = scratch
nodist_scratch_SOURCES = scratch.c
scratch_LDADD = $(top_builddir)/lib/common/libcrmcommon.la -lm
scratch.c:
echo 'int main(void){}' >$@
core:
@echo "Building only core components: $(CORE)"
list='$(CORE)'; for subdir in $$list; do echo "Building $$subdir"; $(MAKE) -C $$subdir all || exit 1; done
core-install:
@echo "Installing only core components: $(CORE)"
list='$(CORE)'; for subdir in $$list; do echo "Installing $$subdir"; $(MAKE) -C $$subdir install || exit 1; done
core-clean:
@echo "Cleaning only core components: $(CORE)"
list='$(CORE)'; for subdir in $$list; do echo "Cleaning $$subdir"; $(MAKE) -C $$subdir clean || exit 1; done
install-exec-local:
$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_CONFIG_DIR)
$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_CORE_DIR)
$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_BLACKBOX_DIR)
-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CONFIG_DIR)
-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CORE_DIR)
-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_BLACKBOX_DIR)
if BUILD_CS_PLUGIN
rm -f $(DESTDIR)$(LCRSODIR)/pacemaker.lcrso $(DESTDIR)$(LCRSODIR)/service_crm.so
cp $(DESTDIR)$(libdir)/service_crm.so $(DESTDIR)$(LCRSODIR)/pacemaker.lcrso
endif
# Use chown because the user/group may not exist
clean-generic:
rm -f $(TARFILE) *.tar.bz2 *.sed
dist-clean-local:
rm -f autoconf automake autoheader
diff --git a/lib/services/Makefile.am b/lib/services/Makefile.am
index 4abd720552..7134ab122e 100644
--- a/lib/services/Makefile.am
+++ b/lib/services/Makefile.am
@@ -1,44 +1,44 @@
# 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
#
#
MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = libcrmservice.la
noinst_HEADERS = pcmk-dbus.h upstart.h systemd.h services_private.h
libcrmservice_la_LDFLAGS = -version-info 5:0:2
libcrmservice_la_CPPFLAGS = -DOCF_ROOT_DIR=\"@OCF_ROOT_DIR@\" $(AM_CPPFLAGS)
libcrmservice_la_CFLAGS = $(GIO_CFLAGS)
libcrmservice_la_CFLAGS += $(CFLAGS_HARDENED_LIB)
libcrmservice_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
libcrmservice_la_LIBADD = $(GIO_LIBS) $(top_builddir)/lib/common/libcrmcommon.la $(DBUS_LIBS)
libcrmservice_la_SOURCES = services.c services_linux.c
if BUILD_DBUS
libcrmservice_la_SOURCES += dbus.c
endif
if BUILD_UPSTART
libcrmservice_la_SOURCES += upstart.c
endif
if BUILD_SYSTEMD
libcrmservice_la_SOURCES += systemd.c
endif
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 0487cc6729..7bd9fb96a1 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -1,175 +1,175 @@
#
# 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.
#
MAINTAINERCLEANFILES = Makefile.in
dtddir = $(CRM_DTD_DIRECTORY)
dtd_DATA = crm.dtd crm-transitional.dtd
xsltdir = $(dtddir)
-xslt_DATA = upgrade06.xsl upgrade-*.xsl
+xslt_DATA = upgrade06.xsl $(top_srcdir)/xml/upgrade-*.xsl
noinst_DATA = context-of.xsl
RNGdir = $(dtddir)
# See Readme.md for details on updating schema files
# Sorted list of available numeric RNG versions,
# extracted from filenames like NAME-MAJOR[.MINOR][.MINOR-MINOR].rng
-RNG_numeric_versions = $(shell ls -1 *.rng \
+RNG_numeric_versions = $(shell ls -1 $(top_srcdir)/xml/*.rng \
| sed -n -e 's/^.*-\([0-9][0-9.]*\).rng$$/\1/p' \
| sort -u -t. -k 1,1n -k 2,2n -k 3,3n)
# The highest numeric version
RNG_max ?= $(lastword $(RNG_numeric_versions))
# A sorted list of all RNG versions (numeric and "next")
RNG_versions = next $(RNG_numeric_versions)
RNG_version_pairs = $(join \
${RNG_numeric_versions},$(addprefix \
-,$(wordlist \
2,$(words ${RNG_numeric_versions}),${RNG_numeric_versions} \
) next \
) \
)
RNG_version_pairs_cnt = $(words ${RNG_version_pairs})
RNG_version_pairs_last = $(wordlist \
$(words \
$(wordlist \
2,${RNG_version_pairs_cnt},${RNG_version_pairs} \
) \
),${RNG_version_pairs_cnt},${RNG_version_pairs} \
)
RNG_generated = pacemaker.rng $(foreach base,$(RNG_versions),pacemaker-$(base).rng) versions.rng
RNG_cfg_base = options nodes resources constraints fencing acls tags alerts
RNG_base = cib $(RNG_cfg_base) status score rule nvset
RNG_files = $(foreach base,$(RNG_base),$(wildcard $(base)*.rng))
# List of non-Pacemaker RNGs
RNG_extra = crm_mon.rng
RNG_DATA = $(RNG_files) $(RNG_generated) $(RNG_extra)
EXTRA_DIST = best-match.sh
versions:
echo "Max: $(RNG_max)"
echo "Available: $(RNG_versions)"
versions.rng: Makefile.am
echo " RNG $@"
echo '<?xml version="1.0" encoding="UTF-8"?>' > $@
echo '<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">' >> $@
echo ' <start>' >> $@
echo ' <interleave>' >> $@
echo ' <optional>' >> $@
echo ' <attribute name="validate-with">' >> $@
echo ' <choice>' >> $@
echo ' <value>none</value>' >> $@
echo ' <value>pacemaker-0.6</value>' >> $@
echo ' <value>transitional-0.6</value>' >> $@
echo ' <value>pacemaker-0.7</value>' >> $@
echo ' <value>pacemaker-1.1</value>' >> $@
for rng in $(RNG_versions); do echo " <value>pacemaker-$$rng</value>" >> $@; done
echo ' </choice>' >> $@
echo ' </attribute>' >> $@
echo ' </optional>' >> $@
echo ' <attribute name="admin_epoch"><data type="nonNegativeInteger"/></attribute>' >> $@
echo ' <attribute name="epoch"><data type="nonNegativeInteger"/></attribute>' >> $@
echo ' <attribute name="num_updates"><data type="nonNegativeInteger"/></attribute>' >> $@
echo ' </interleave>' >> $@
echo ' </start>' >> $@
echo '</grammar>' >> $@
pacemaker.rng: pacemaker-$(RNG_max).rng
echo " RNG $@"
cp $(top_builddir)/xml/$< $@
-pacemaker-%.rng: $(RNG_files) best-match.sh Makefile.am
+pacemaker-%.rng: $(RNG_files) best-match.sh Makefile.am
echo " RNG $@"
echo '<?xml version="1.0" encoding="UTF-8"?>' > $@
echo '<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">' >> $@
echo ' <start>' >> $@
echo ' <element name="cib">' >> $@
- ./best-match.sh cib $(*) $(@) " "
+ $(top_srcdir)/xml/best-match.sh cib $(*) $(@) " "
echo ' <element name="configuration">' >> $@
echo ' <interleave>' >> $@
- for rng in $(RNG_cfg_base); do ./best-match.sh $$rng $(*) $(@) " " || :; done
+ for rng in $(RNG_cfg_base); do $(top_srcdir)/xml/best-match.sh $$rng $(*) $(@) " " || :; done
echo ' </interleave>' >> $@
echo ' </element>' >> $@
echo ' <optional>' >> $@
echo ' <element name="status">' >> $@
- ./best-match.sh status $(*) $(@) " "
+ $(top_srcdir)/xml/best-match.sh status $(*) $(@) " "
echo ' </element>' >> $@
echo ' </optional>' >> $@
echo ' </element>' >> $@
echo ' </start>' >> $@
echo '</grammar>' >> $@
# diff fails with ec=2 if no predecessor is found;
# this uses '=' GNU extension to sed, if that's not available,
# one can use: hline=`echo "$${p}" | grep -Fn "$${hunk}" | cut -d: -f1`;
# XXX: use line information from hunk to avoid "not detected" for ambiguity
version_diff = \
@for p in $(1); do \
set `echo "$${p}" | tr '-' ' '`; \
echo "\#\#\# *-$$2.rng vs. predecessor"; \
for v in *-$$2.rng; do \
echo "\#\#\#\# $${v} vs. predecessor"; b=`echo "$${v}" | cut -d- -f1`; \
old=`./best-match.sh $${b} $$1`; \
p=`diff -u "$${old}" "$${v}" 2>/dev/null`; \
case $$? in \
1) echo "$${p}" | sed -n -e '/^@@ /!d;=;p' \
-e ':l;n;/^\([- ]\|+.*<[^ />]\+\([^/>]\+="ID\|>$$\)\)/bl;s/^[+ ]\(.*\)/\1/p' \
| while read hline; do \
read h && read i || break; \
iline=`grep -Fn "$${i}" "$${v}" | cut -d: -f1`; \
ctxt="(not detected)"; \
if test `echo "$${iline}" | wc -l` -eq 1; then \
ctxt=`{ sed -n -e "1,$$(($${iline}-1))p" "$${v}"; \
echo "<inject id=\"GOAL\"/>$${i}"; \
sed -n -e "$$(($${iline}+1)),$$ p" "$${v}"; \
} | $(XSLTPROC) --param skip 1 context-of.xsl -`; \
fi; \
echo "$${p}" | sed -n -e "$$(($${hline}-2)),$${hline}!d" \
-e '/^\(+++\|---\)/p'; \
echo "$${h} context: $${ctxt}"; \
echo "$${p}" | sed -n -e "1,$${hline}d" \
-e '/^\(---\|@@ \)/be;p;d;:e;n;be'; \
done; \
;; \
2) echo "\#\#\#\#\# $${v} has no predecessor";; \
esac; \
done; \
done
diff: best-match.sh
@echo "# Comparing changes in + since $(RNG_max)"
$(call version_diff,${RNG_version_pairs_last})
fulldiff: best-match.sh
@echo "# Comparing all changes across all the subsequent increments"
$(call version_diff,${RNG_version_pairs})
sync:
git rm -f $(wildcard *-next.rng)
make pacemaker-next.rng
CLEANFILES = $(RNG_generated)