diff --git a/cts/Makefile.am b/cts/Makefile.am index bc4cedbf2b..adc43f228a 100644 --- a/cts/Makefile.am +++ b/cts/Makefile.am @@ -1,96 +1,98 @@ # # Copyright 2001-2019 the Pacemaker project contributors # # The version control history for this file may have further details. # # This source code is licensed under the GNU General Public License version 2 # or later (GPLv2+) WITHOUT ANY WARRANTY. # MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = $(cts_SCRIPTS) $(cts_DATA) +noinst_SCRIPTS = cluster_test \ + OCFIPraTest.py halibdir = $(CRM_DAEMON_DIR) halib_SCRIPTS = cts-log-watcher cts-support # # Test commands and globally applicable test files should be in $(testdir), # and command-specific test data should be in a command-specific subdirectory. # testdir = $(datadir)/$(PACKAGE)/tests test_SCRIPTS = cts-coverage cts-regression cts-cli cts-exec cts-scheduler \ cts-fencing test_DATA = README.md valgrind-pcmk.suppressions ctslibdir = $(pythondir)/cts ctslib_PYTHON = __init__.py \ CTSvars.py \ CM_common.py \ CM_corosync.py \ CTS.py \ CTSaudits.py \ CTStests.py \ CTSscenarios.py \ CIB.py \ cib_xml.py \ environment.py \ logging.py \ patterns.py \ remote.py \ watcher.py ctsdir = $(testdir)/cts cts_DATA = pacemaker-cts-dummyd@.service if BUILD_UPSTART cts_DATA += pacemaker-cts-dummyd.conf endif cts_SCRIPTS = cts \ CTSlab.py \ lxc_autogen.sh \ LSBDummy \ fence_dummy \ pacemaker-cts-dummyd clidir = $(testdir)/cli cli_DATA = cli/regression.dates.exp \ cli/regression.tools.exp \ cli/regression.acls.exp \ cli/regression.validity.exp \ cli/regression.upgrade.exp \ cli/regression.rules.exp \ cli/crm_diff_new.xml \ cli/crm_diff_old.xml PE_TESTS = $(wildcard scheduler/*.scores) pedir = $(testdir)/scheduler pe_DATA = $(PE_TESTS) \ $(PE_TESTS:%.scores=%.xml) \ $(PE_TESTS:%.scores=%.exp) \ $(PE_TESTS:%.scores=%.dot) \ $(PE_TESTS:%.scores=%.summary) \ $(wildcard scheduler/*.stderr) # For "make check", run a single scheduler test TESTS = scheduler/bug-rh-1097457.xml TEST_EXTENSIONS = .xml XML_LOG_COMPILER = ./cts-scheduler AM_XML_LOG_FLAGS = -V --run scheduler-list: @for T in "$(srcdir)"/scheduler/*.xml; do \ echo $$(basename $$T .xml); \ done clean-local: rm -f scheduler/*.pe.* SUBDIRS = benchmark cts-support-install: cts-support ./cts-support install cts-support-uninstall: cts-support ./cts-support uninstall diff --git a/daemons/controld/Makefile.am b/daemons/controld/Makefile.am index 858e1bb390..b3e5587b6f 100644 --- a/daemons/controld/Makefile.am +++ b/daemons/controld/Makefile.am @@ -1,80 +1,81 @@ # # Copyright 2018-2019 the Pacemaker project contributors # # The version control history for this file may have further details. # # This source code is licensed under the GNU General Public License version 2 # or later (GPLv2+) WITHOUT ANY WARRANTY. # include $(top_srcdir)/Makefile.common halibdir = $(CRM_DAEMON_DIR) halib_PROGRAMS = pacemaker-controld noinst_HEADERS = controld_alerts.h \ controld_callbacks.h \ + controld_fencing.h \ controld_fsa.h \ controld_lrm.h \ controld_matrix.h \ controld_membership.h \ controld_messages.h \ controld_metadata.h \ controld_throttle.h \ controld_transition.h \ controld_utils.h \ pacemaker-controld.h pacemaker_controld_CFLAGS = $(CFLAGS_HARDENED_EXE) pacemaker_controld_LDFLAGS = $(LDFLAGS_HARDENED_EXE) pacemaker_controld_LDADD = $(top_builddir)/lib/fencing/libstonithd.la \ $(top_builddir)/lib/pacemaker/libpacemaker.la \ $(top_builddir)/lib/pengine/libpe_rules.la \ $(top_builddir)/lib/cib/libcib.la \ $(top_builddir)/lib/cluster/libcrmcluster.la \ $(top_builddir)/lib/common/libcrmcommon.la \ $(top_builddir)/lib/services/libcrmservice.la \ $(top_builddir)/lib/lrmd/liblrmd.la \ $(CLUSTERLIBS) pacemaker_controld_SOURCES = pacemaker-controld.c \ controld_attrd.c \ controld_callbacks.c \ controld_based.c \ controld_control.c \ controld_corosync.c \ controld_election.c \ controld_execd.c \ controld_execd_state.c \ controld_fencing.c \ controld_fsa.c \ controld_join_client.c \ controld_join_dc.c \ controld_membership.c \ controld_messages.c \ controld_metadata.c \ controld_remote_ra.c \ controld_schedulerd.c \ controld_te_actions.c \ controld_te_callbacks.c \ controld_te_events.c \ controld_te_utils.c \ controld_throttle.c \ controld_transition.c \ controld_utils.c if BUILD_XML_HELP man7_MANS = pacemaker-controld.7 endif CLEANFILES = $(man7_MANS) if BUILD_LEGACY_LINKS install-exec-hook: cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f crmd && $(LN_S) pacemaker-controld crmd uninstall-hook: cd $(DESTDIR)$(CRM_DAEMON_DIR) && rm -f crmd endif diff --git a/include/Makefile.am b/include/Makefile.am index 97688a80e1..e2bd4bc987 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,28 +1,21 @@ # # Copyright 2003-2019 the Pacemaker project contributors # # The version control history for this file may have further details. # -# 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. +# This source code is licensed under the GNU General Public License version 2 +# or later (GPLv2+) WITHOUT ANY WARRANTY. # MAINTAINERCLEANFILES = Makefile.in config.h.in -noinst_HEADERS = portability.h config.h crm_internal.h pacemaker-internal.h +noinst_HEADERS = config.h \ + crm_internal.h \ + doxygen.h \ + pacemaker-internal.h \ + portability.h pkginclude_HEADERS = crm_config.h SUBDIRS = crm pcmki .PHONY: $(ARCHIVE_VERSION) diff --git a/include/crm/Makefile.am b/include/crm/Makefile.am index bc939ebc53..9d57dd9053 100644 --- a/include/crm/Makefile.am +++ b/include/crm/Makefile.am @@ -1,27 +1,19 @@ # # Copyright 2004-2019 the Pacemaker project contributors # # The version control history for this file may have further details. # -# 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. +# This source code is licensed under the GNU General Public License version 2 +# or later (GPLv2+) WITHOUT ANY WARRANTY. # + MAINTAINERCLEANFILES = Makefile.in headerdir=$(pkgincludedir)/crm header_HEADERS = attrd.h cib.h cluster.h compatibility.h crm.h \ lrmd.h msg_xml.h services.h stonith-ng.h +noinst_HEADERS = lrmd_alerts_internal.h + SUBDIRS = common pengine cib fencing cluster