Page MenuHomeClusterLabs Projects
Files F4638875

No OneTemporary
Actions

View Options

diff --git a/crm/Makefile.am b/crm/Makefile.am
index 20006790ec..c792e2348a 100644
--- a/crm/Makefile.am
+++ b/crm/Makefile.am
@@ -1,31 +1,31 @@
#
# 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
## Subdirectories
-SUBDIRS = common cib crmd pengine tengine admin test
-#EXTRA_DIST = admin_cib_test.sh
+SUBDIRS = cib crmd pengine tengine admin test
+DIST_SUBDIRS = cib crmd pengine tengine admin test
crmdir = $(HA_VARLIBDIR)/$(HB_PKG)/crm
noinst_HEADERS = dmalloc_wrapper.h
install-exec-local:
$(mkinstalldirs) $(DESTDIR)/$(crmdir)
-chown $(HA_CCMUSER) $(DESTDIR)/$(crmdir)
-chgrp $(HA_APIGROUP) $(DESTDIR)/$(crmdir)
-chmod g+w $(DESTDIR)/$(crmdir)
diff --git a/crm/admin/Makefile.am b/crm/admin/Makefile.am
index a70d9d2e7e..e9ea6deb65 100644
--- a/crm/admin/Makefile.am
+++ b/crm/admin/Makefile.am
@@ -1,85 +1,85 @@
#
# 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
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-I$(top_builddir) -I$(top_srcdir)
hadir = $(sysconfdir)/ha.d
halibdir = $(libdir)/@HB_PKG@
commmoddir = $(halibdir)/modules/comm
havarlibdir = $(localstatedir)/lib/@HB_PKG@
PIDFILE = $(localstatedir)/run/crmd.pid
XML_FLAGS = `xml2-config --cflags`
XML_LIBS = `xml2-config --libs`
# sockets with path
crmdir = $(havarlibdir)/crm
apigid = @HA_APIGID@
crmuid = @HA_CCMUID@
COMMONLIBS = $(CRM_DEBUG_LIBS) \
$(top_builddir)/lib/clplumbing/libplumb.la \
- $(top_builddir)/$(CRM_DIR)/common/libcrmcommon.la \
- $(top_builddir)/lib/$(CRM_DIR)/cib/libcib.la \
+ $(top_builddir)/lib/crm/common/libcrmcommon.la \
+ $(top_builddir)/lib/crm/cib/libcib.la \
$(top_builddir)/lib/apphb/libapphb.la \
$(top_builddir)/lib/hbclient/libhbclient.la \
$(GLIBLIB) \
$(LIBRT)
LIBRT = @LIBRT@
AM_CFLAGS = @CFLAGS@ \
-DPIDFILE='"$(PIDFILE)"' \
$(CRM_DEBUG_FLAGS)
## libraries
lib_LTLIBRARIES =
## binary progs
halib_PROGRAMS = crmadmin cibadmin ccm_tool
## SOURCES
#noinst_HEADERS = config.h control.h crmd.h
noinst_HEADERS =
crmadmin_SOURCES = crmadmin.c
crmadmin_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
crmadmin_LDFLAGS = $(XML_LIBS)
crmadmin_LDADD = $(COMMONLIBS)
cibadmin_SOURCES = cibadmin.c
cibadmin_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
cibadmin_LDFLAGS = $(XML_LIBS)
cibadmin_LDADD = $(COMMONLIBS)
ccm_tool_SOURCES = ccm_epoche.c
ccm_tool_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
ccm_tool_LDADD = $(COMMONLIBS) \
$(top_builddir)/membership/ccm/libccmclient.la
clean-generic:
rm -f *.log *.debug *.xml *~
install-exec-local:
uninstall-local:
diff --git a/crm/cib/Makefile.am b/crm/cib/Makefile.am
index 03299f6f09..ae79427314 100644
--- a/crm/cib/Makefile.am
+++ b/crm/cib/Makefile.am
@@ -1,79 +1,79 @@
#
# 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
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-I$(top_builddir) -I$(top_srcdir)
hadir = $(sysconfdir)/ha.d
halibdir = $(libdir)/@HB_PKG@
commmoddir = $(halibdir)/modules/comm
havarlibdir = $(localstatedir)/lib/@HB_PKG@
PIDFILE = $(localstatedir)/run/crmd.pid
XML_FLAGS = `xml2-config --cflags`
XML_LIBS = `xml2-config --libs`
# sockets with path
crmdir = $(havarlibdir)/crm
apigid = @HA_APIGID@
crmuid = @HA_CCMUID@
crmreqsocket = $(havarlibdir)/api/crm.req
crmressocket = $(havarlibdir)/api/crm.rsp
COMMONLIBS = $(CRM_DEBUG_LIBS) \
$(top_builddir)/lib/clplumbing/libplumb.la \
- $(top_builddir)/$(CRM_DIR)/common/libcrmcommon.la \
+ $(top_builddir)/lib/crm/common/libcrmcommon.la \
$(top_builddir)/lib/apphb/libapphb.la \
$(top_builddir)/lib/hbclient/libhbclient.la \
$(top_builddir)/lib/crm/cib/libcib.la \
$(GLIBLIB) \
$(LIBRT)
LIBRT = @LIBRT@
AM_CFLAGS = @CFLAGS@ -DPIDFILE='"$(PIDFILE)"' $(CRM_DEBUG_FLAGS)
## binary progs
halib_PROGRAMS = cib cibmon
## SOURCES
#noinst_HEADERS = config.h control.h crmd.h
noinst_HEADERS = cibio.h cibmessages.h cibprimatives.h notify.h \
callbacks.h
cib_SOURCES = io.c primatives.c messages.c cib.c notify.c \
callbacks.c main.c
cib_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
cib_LDFLAGS = $(XML_LIBS)
cib_LDADD = $(COMMONLIBS) \
$(top_builddir)/membership/ccm/libccmclient.la
cibmon_SOURCES = cibmon.c
cibmon_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
cibmon_LDFLAGS = $(XML_LIBS)
cibmon_LDADD = $(COMMONLIBS)
clean-generic:
rm -f *.log *.debug *.xml *~
install-exec-local:
uninstall-local:
diff --git a/crm/crmd/Makefile.am b/crm/crmd/Makefile.am
index 302e7ab389..dbd987d5f6 100644
--- a/crm/crmd/Makefile.am
+++ b/crm/crmd/Makefile.am
@@ -1,101 +1,101 @@
#
# 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
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-I$(top_builddir) -I$(top_srcdir)
hadir = $(sysconfdir)/ha.d
halibdir = $(libdir)/@HB_PKG@
commmoddir = $(halibdir)/modules/comm
havarlibdir = $(localstatedir)/lib/@HB_PKG@
PIDFILE = $(localstatedir)/run/crmd.pid
XML_FLAGS = `xml2-config --cflags`
XML_LIBS = `xml2-config --libs`
# sockets with path
crmdir = $(havarlibdir)/crm
apigid = @HA_APIGID@
crmuid = @HA_CCMUID@
COMMONLIBS = $(CRM_DEBUG_LIBS) \
$(top_builddir)/lib/clplumbing/libplumb.la \
- $(top_builddir)/$(CRM_DIR)/common/libcrmcommon.la \
+ $(top_builddir)/lib/crm/common/libcrmcommon.la \
$(top_builddir)/lib/crm/cib/libcib.la \
$(top_builddir)/lib/apphb/libapphb.la \
$(top_builddir)/lib/hbclient/libhbclient.la \
$(GLIBLIB) \
$(LIBRT)
LIBRT = @LIBRT@
AM_CFLAGS = @CFLAGS@ \
-DPIDFILE='"$(PIDFILE)"' \
$(CRM_DEBUG_FLAGS)
## libraries
lib_LTLIBRARIES =
## binary progs
halib_PROGRAMS = crmd atest
## SOURCES
noinst_HEADERS = crmd.h crmd_fsa.h crmd_messages.h fsa_defines.h \
fsa_matrix.h fsa_proto.h crmd_utils.h crmd_callbacks.h
atest_SOURCES = atest.c
atest_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
atest_LDFLAGS = $(XML_LIBS)
atest_LDADD = $(COMMONLIBS)
crmd_SOURCES = main.c crmd.c \
fsa.c control.c messages.c ccm.c callbacks.c \
election.c join_client.c join_dc.c subsystems.c \
cib.c pengine.c tengine.c lrm.c \
utils.c misc.c
crmd_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
crmd_LDFLAGS = $(XML_LIBS)
crmd_LDADD = $(COMMONLIBS) \
$(top_builddir)/lib/lrm/liblrm.la \
$(top_builddir)/membership/ccm/libccmclient.la
# Simple HA client app
#clnt_SOURCES = clnt.c
#clnt_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
#clnt_LDFLAGS = $(XML_LIBS)
#clnt_LDADD = $(COMMONLIBS)
clean-generic:
rm -f *.log *.debug *.xml *~
install-exec-local:
uninstall-local:
graphs: fsa_inputs.png fsa_inputs_by_action.png fsa_actions_by_state.png
%.png: %.dot
dot -Tpng $< > $@
%.dot : fsa_matrix.h
perl make_dot.pl
diff --git a/crm/pengine/Makefile.am b/crm/pengine/Makefile.am
index ff2fd592d6..13fa0a3024 100644
--- a/crm/pengine/Makefile.am
+++ b/crm/pengine/Makefile.am
@@ -1,87 +1,87 @@
#
# 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
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-I$(top_builddir) -I$(top_srcdir)
hadir = $(sysconfdir)/ha.d
halibdir = $(libdir)/@HB_PKG@
commmoddir = $(halibdir)/modules/comm
havarlibdir = $(localstatedir)/lib/@HB_PKG@
PIDFILE = $(localstatedir)/run/crmd.pid
XML_FLAGS = `xml2-config --cflags`
XML_LIBS = `xml2-config --libs`
# sockets with path
crmdir = $(havarlibdir)/crm
apigid = @HA_APIGID@
crmuid = @HA_CCMUID@
COMMONLIBS = $(CRM_DEBUG_LIBS) \
$(top_builddir)/lib/clplumbing/libplumb.la \
- $(top_builddir)/$(CRM_DIR)/common/libcrmcommon.la \
- $(top_builddir)/lib/$(CRM_DIR)/cib/libcib.la \
+ $(top_builddir)/lib/crm/common/libcrmcommon.la \
+ $(top_builddir)/lib/crm/cib/libcib.la \
$(top_builddir)/lib/apphb/libapphb.la \
$(GLIBLIB) \
$(LIBRT)
LIBRT = @LIBRT@
AM_CFLAGS = @CFLAGS@ \
-DPIDFILE='"$(PIDFILE)"' \
$(CRM_DEBUG_FLAGS)
## libraries
lib_LTLIBRARIES =
## binary progs
halib_PROGRAMS = ptest pengine
## SOURCES
noinst_HEADERS = pe_utils.h pengine.h complex.h pe_rules.h
ptest_SOURCES = color.c unpack.c graph.c \
native.c group.c incarnation.c complex.c \
rules.c pengine.c stages.c utils.c ptest.c
ptest_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
ptest_LDFLAGS = $(XML_LIBS)
ptest_LDADD = $(COMMONLIBS)
pengine_SOURCES = unpack.c color.c graph.c \
native.c group.c incarnation.c complex.c \
rules.c pengine.c stages.c utils.c main.c
pengine_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
pengine_LDFLAGS = $(XML_LIBS)
pengine_LDADD = $(COMMONLIBS) \
$(top_builddir)/lib/hbclient/libhbclient.la
#
clean-generic:
rm -f *.log *.debug *~
install-exec-local:
uninstall-local:
diff --git a/crm/tengine/Makefile.am b/crm/tengine/Makefile.am
index c9b198e2c4..7459356104 100644
--- a/crm/tengine/Makefile.am
+++ b/crm/tengine/Makefile.am
@@ -1,74 +1,74 @@
#
# 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
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
-I$(top_builddir) -I$(top_srcdir)
hadir = $(sysconfdir)/ha.d
halibdir = $(libdir)/@HB_PKG@
commmoddir = $(halibdir)/modules/comm
havarlibdir = $(localstatedir)/lib/@HB_PKG@
PIDFILE = $(localstatedir)/run/crmd.pid
XML_FLAGS = `xml2-config --cflags`
XML_LIBS = `xml2-config --libs`
crmdir = $(havarlibdir)/crm
COMMONLIBS = $(CRM_DEBUG_LIBS) \
$(top_builddir)/lib/clplumbing/libplumb.la \
- $(top_builddir)/$(CRM_DIR)/common/libcrmcommon.la \
- $(top_builddir)/lib/$(CRM_DIR)/cib/libcib.la \
+ $(top_builddir)/lib/crm/common/libcrmcommon.la \
+ $(top_builddir)/lib/crm/cib/libcib.la \
$(top_builddir)/lib/apphb/libapphb.la \
$(top_builddir)/lib/hbclient/libhbclient.la \
$(GLIBLIB) \
$(LIBRT)
LIBRT = @LIBRT@
AM_CFLAGS = @CFLAGS@ -DPIDFILE='"$(PIDFILE)"' $(CRM_DEBUG_FLAGS)
## binary progs
halib_PROGRAMS = ttest tengine
## SOURCES
noinst_HEADERS = tengine.h
tengine_SOURCES = tengine.c unpack.c utils.c callbacks.c main.c
tengine_CFLAGS = $(XML_FLAGS) -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
tengine_LDFLAGS = $(XML_LIBS)
tengine_LDADD = $(COMMONLIBS) \
$(top_builddir)/lib/fencing/libstonithd.la
ttest_SOURCES = tengine.c unpack.c utils.c callbacks.c ttest.c
ttest_CFLAGS = $(XML_FLAGS) -DTESTING=1 -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
ttest_LDFLAGS = $(XML_LIBS)
ttest_LDADD = $(COMMONLIBS) \
$(top_builddir)/lib/fencing/libstonithd.la
clean-generic:
rm -f *.log *.debug *~
install-exec-local:
uninstall-local:
diff --git a/lib/crm/Makefile.am b/lib/crm/Makefile.am
index dc59cdeae1..dd090817dd 100644
--- a/lib/crm/Makefile.am
+++ b/lib/crm/Makefile.am
@@ -1,22 +1,22 @@
#
# 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
## Subdirectories...
-SUBDIRS = cib
-DIST_SUBDIRS = cib
+SUBDIRS = cib common
+DIST_SUBDIRS = cib common

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 10, 1:34 AM (22 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2009535
Default Alt Text
(16 KB)

Event Timeline