diff --git a/cib/Makefile.am b/cib/Makefile.am index 130d0ed0b1..8f6e7115ef 100644 --- a/cib/Makefile.am +++ b/cib/Makefile.am @@ -1,72 +1,69 @@ # # 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$(AISPREFIX)/include/openais EXTRA_DIST = cib.pam hadir = $(sysconfdir)/ha.d halibdir = $(libdir)/@HB_PKG@ commmoddir = $(halibdir)/modules/comm havarlibdir = $(localstatedir)/lib/@HB_PKG@ # sockets with path crmdir = $(havarlibdir)/crm crmreqsocket = $(havarlibdir)/api/crm.req crmressocket = $(havarlibdir)/api/crm.rsp COMMONLIBS = \ -lhbclient \ $(top_builddir)/lib/crm/common/libcrmcommon.la \ $(top_builddir)/lib/crm/cib/libcib.la \ $(GLIBLIB) \ $(AISLIBS) \ $(LIBRT) -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ $(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 remote.c cib_LDADD = $(COMMONLIBS) $(CRYPTOLIB) -lccmclient \ $(top_builddir)/lib/crm/common/libcrmcluster.la cib_LDFLAGS = $(GNUTLSLIBS) cibmon_SOURCES = cibmon.c cibmon_LDADD = $(COMMONLIBS) clean-generic: rm -f *.log *.debug *.xml *~ install-exec-local: # cp -f $(top_srcdir)/crm/cib/cib.pam $(DESTDIR)/etc/pam.d/cib uninstall-local: diff --git a/crm/admin/Makefile.am b/crm/admin/Makefile.am index 672053f771..b7cf18a575 100644 --- a/crm/admin/Makefile.am +++ b/crm/admin/Makefile.am @@ -1,103 +1,100 @@ # # 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) -I$(top_srcdir) \ -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \ -I$(AISPREFIX)/include/openais halibdir = $(libdir)/@HB_PKG@ -hasbindir = $(sbindir) -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS) COMMONLIBS = \ $(top_builddir)/lib/crm/common/libcrmcommon.la \ $(top_builddir)/lib/crm/cib/libcib.la \ -lplumb \ $(GLIBLIB) \ $(CURSESLIBS) \ $(AISLIBS) \ $(LIBRT) halib_PYTHON = crm_primitive.py crm_utils.py crm_commands.py -hasbin_PROGRAMS = crmadmin cibadmin ccm_tool crm_diff crm_mon iso8601 \ +sbin_PROGRAMS = crmadmin cibadmin ccm_tool crm_diff crm_mon iso8601 \ crm_master crm_standby crm_failcount crm_attribute \ crm_resource crm_verify crm_uuid -hasbin_SCRIPTS = crm_sh +sbin_SCRIPTS = crm_sh ## SOURCES #noinst_HEADERS = config.h control.h crmd.h noinst_HEADERS = crmadmin_SOURCES = crmadmin.c crmadmin_LDADD = $(COMMONLIBS) -lhbclient \ $(top_builddir)/lib/crm/pengine/libpe_status.la crm_uuid_SOURCES = crm_uuid.c crm_uuid_LDADD = $(GLIBLIB) cibadmin_SOURCES = cibadmin.c cibadmin_LDADD = $(COMMONLIBS) ccm_tool_SOURCES = ccm_epoche.c ccm_tool_LDADD = $(COMMONLIBS) -lccmclient -lhbclient \ $(top_builddir)/lib/crm/common/libcrmcluster.la crm_diff_SOURCES = xml_diff.c crm_diff_LDADD = $(COMMONLIBS) crm_mon_SOURCES = crm_mon.c crm_mon_LDADD = $(COMMONLIBS) \ $(top_builddir)/lib/crm/pengine/libpe_status.la # Arguments could be made that this should live in crm/pengine crm_verify_SOURCES = crm_verify.c crm_verify_LDADD = $(COMMONLIBS) \ $(top_builddir)/lib/crm/pengine/libpe_status.la \ $(top_builddir)/pengine/libpengine.la crm_master_SOURCES = crm_attribute.c crm_master_LDADD = $(COMMONLIBS) crm_standby_SOURCES = crm_attribute.c crm_standby_LDADD = $(COMMONLIBS) crm_attribute_SOURCES = crm_attribute.c crm_attribute_LDADD = $(COMMONLIBS) crm_failcount_SOURCES = crm_attribute.c crm_failcount_LDADD = $(COMMONLIBS) crm_resource_SOURCES = crm_resource.c crm_resource_LDADD = $(COMMONLIBS) \ $(top_builddir)/lib/crm/pengine/libpe_status.la iso8601_SOURCES = test.iso8601.c iso8601_LDADD = $(COMMONLIBS) clean-generic: rm -f *.log *.debug *.xml *~ install-exec-local: uninstall-local: diff --git a/crmd/Makefile.am b/crmd/Makefile.am index f44b7652bd..5a858982a8 100644 --- a/crmd/Makefile.am +++ b/crmd/Makefile.am @@ -1,85 +1,70 @@ # # 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$(AISPREFIX)/include/openais -EXTRA_DIST = - -hadir = $(sysconfdir)/ha.d halibdir = $(libdir)/@HB_PKG@ -commmoddir = $(halibdir)/modules/comm -havarlibdir = $(localstatedir)/lib/@HB_PKG@ - -# sockets with path -crmdir = $(havarlibdir)/crm COMMONLIBS = \ $(top_builddir)/lib/crm/common/libcrmcommon.la \ $(top_builddir)/lib/crm/pengine/libpe_rules.la \ $(top_builddir)/lib/crm/cib/libcib.la \ -lplumb \ $(GLIBLIB) \ $(AISLIBS) \ $(LIBRT) -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ \ - $(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 \ crmd_lrm.h atest_SOURCES = atest.c 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_LDADD = $(COMMONLIBS) $(top_builddir)/lib/crm/common/libcrmcluster.la\ -lhbclient -llrm -lccmclient 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 make_dot.pl perl $(top_srcdir)/crm/crmd/make_dot.pl $(top_srcdir)/crm/crmd/fsa_matrix.h $(top_builddir)/crm/crmd diff --git a/lib/crm/cib/Makefile.am b/lib/crm/cib/Makefile.am index 0c8f01bca1..539dc0e7c7 100644 --- a/lib/crm/cib/Makefile.am +++ b/lib/crm/cib/Makefile.am @@ -1,57 +1,39 @@ # # 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@ -crmdir = $(havarlibdir)/crm -XML_FLAGS = `xml2-config --cflags` -XML_LIBS = `xml2-config --libs` - -# sockets with path -apigid = @HA_APIGID@ -crmuid = @HA_CCMUID@ - -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS) + -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl ## libraries lib_LTLIBRARIES = libcib.la ## SOURCES noinst_HEADERS = cib_private.h libcib_la_SOURCES = cib_client.c cib_native.c cib_attrs.c \ cib_version.c libcib_la_LDFLAGS = -version-info 1:1:0 libcib_la_CFLAGS = -I$(top_builddir) clean-generic: rm -f *.log *.debug *.xml *~ install-exec-local: uninstall-local: diff --git a/lib/crm/common/Makefile.am b/lib/crm/common/Makefile.am index 4c182c0e95..82937a75ba 100644 --- a/lib/crm/common/Makefile.am +++ b/lib/crm/common/Makefile.am @@ -1,56 +1,41 @@ # # 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) \ -I$(AISPREFIX)/include/openais -AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS) - -hadir = $(sysconfdir)/ha.d -halibdir = $(libdir)/@HB_PKG@ - ## libraries lib_LTLIBRARIES = libcrmcommon.la libcrmcluster.la - -## binary progs -halib_PROGRAMS = - -## SOURCES - -noinst_HEADERS = - libcrmcluster_la_SOURCES = cluster.c heartbeat.c ais.c libcrmcluster_la_LDFLAGS = -version-info 1:0:0 libcrmcommon_la_SOURCES = ipc.c utils.c xml.c ctrl.c \ iso8601.c iso8601_fields.c membership.c libcrmcommon_la_LDFLAGS = -version-info 2:0:0 clean-generic: rm -f *.log *.debug *.xml *~ install-exec-local: uninstall-local: diff --git a/lib/crm/pengine/Makefile.am b/lib/crm/pengine/Makefile.am index 3de206cd0f..c905196b7a 100644 --- a/lib/crm/pengine/Makefile.am +++ b/lib/crm/pengine/Makefile.am @@ -1,59 +1,43 @@ # # 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@ -pe_varlibdir = $(HA_VARLIBDIR)/$(HB_PKG)/pengine - -# sockets with path -crmdir = $(havarlibdir)/crm -apigid = @HA_APIGID@ -crmuid = @HA_CCMUID@ - -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS) + -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl ## libraries lib_LTLIBRARIES = libpe_rules.la libpe_status.la ## SOURCES noinst_HEADERS = unpack.h utils.h variant.h rule_files = rules.c common.c status_files = status.c unpack.c utils.c complex.c native.c group.c clone.c libpe_rules_la_LDFLAGS = -version-info 2:0:0 libpe_rules_la_SOURCES = $(rule_files) libpe_status_la_LDFLAGS = -version-info 2:0:0 libpe_status_la_SOURCES = $(rule_files) $(status_files) clean-generic: rm -f *.log *.debug *~ install-exec-local: uninstall-local: diff --git a/lib/crm/transition/Makefile.am b/lib/crm/transition/Makefile.am index 542089d8f9..0911615b17 100644 --- a/lib/crm/transition/Makefile.am +++ b/lib/crm/transition/Makefile.am @@ -1,45 +1,38 @@ # # 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) - -halibdir = $(libdir)/@HB_PKG@ - -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS) + -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl ## libraries lib_LTLIBRARIES = libtransitioner.la ## SOURCES noinst_HEADERS = libtransitioner_la_SOURCES = unpack.c graph.c utils.c libtransitioner_la_LDFLAGS = -version-info 1:0:0 libtransitioner_la_CFLAGS = -I$(top_builddir) clean-generic: rm -f *~ install-exec-local: uninstall-local: diff --git a/pengine/Makefile.am b/pengine/Makefile.am index b937377ad6..28f08bfeb4 100644 --- a/pengine/Makefile.am +++ b/pengine/Makefile.am @@ -1,81 +1,71 @@ # # 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) -I$(top_srcdir) \ -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl -hadir = $(sysconfdir)/ha.d -hasbindir = $(sbindir) halibdir = $(libdir)/@HB_PKG@ -commmoddir = $(halibdir)/modules/comm -havarlibdir = $(localstatedir)/lib/@HB_PKG@ pe_varlibdir = $(HA_VARLIBDIR)/$(HB_PKG)/pengine -# sockets with path -crmdir = $(havarlibdir)/crm - COMMONLIBS = \ $(top_builddir)/lib/crm/common/libcrmcommon.la \ $(top_builddir)/lib/crm/pengine/libpe_status.la \ libpengine.la \ $(GLIBLIB) \ $(CURSESLIBS) \ $(AISLIBS) \ $(LIBRT) -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS) - ## libraries lib_LTLIBRARIES = libpengine.la ## binary progs halib_PROGRAMS = pengine -hasbin_PROGRAMS = ptest +sbin_PROGRAMS = ptest ## SOURCES noinst_HEADERS = allocate.h utils.h pengine.h #utils.h pengine.h libpengine_la_LDFLAGS = -version-info 3:0:0 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version libpengine_la_SOURCES = pengine.c allocate.c utils.c constraints.c \ native.c group.c clone.c master.c graph.c pengine_SOURCES = main.c pengine_LDADD = $(COMMONLIBS) $(top_builddir)/lib/crm/cib/libcib.la # libcib for get_object_root() # $(top_builddir)/lib/hbclient/libhbclient.la ptest_SOURCES = ptest.c ptest_LDADD = $(COMMONLIBS) \ $(top_builddir)/lib/crm/cib/libcib.la \ $(top_builddir)/lib/crm/transition/libtransitioner.la clean-generic: rm -f *.log *.debug *~ .gres.* testcases/.gres.* install-exec-local: $(mkinstalldirs) $(DESTDIR)/$(pe_varlibdir) -chown $(HA_CCMUSER) $(DESTDIR)/$(pe_varlibdir) -chgrp $(HA_APIGROUP) $(DESTDIR)/$(pe_varlibdir) -chmod 750 $(DESTDIR)/$(pe_varlibdir) uninstall-local: diff --git a/transitioner/Makefile.am b/transitioner/Makefile.am index 37a61f89d5..26b4283115 100644 --- a/transitioner/Makefile.am +++ b/transitioner/Makefile.am @@ -1,62 +1,53 @@ # # 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 -hadir = $(sysconfdir)/ha.d halibdir = $(libdir)/@HB_PKG@ -commmoddir = $(halibdir)/modules/comm -havarlibdir = $(localstatedir)/lib/@HB_PKG@ -crmdir = $(havarlibdir)/crm - -COMMONLIBS = \ - $(top_builddir)/lib/crm/common/libcrmcommon.la \ - $(top_builddir)/lib/crm/cib/libcib.la \ +COMMONLIBS = \ + $(top_builddir)/lib/crm/common/libcrmcommon.la \ + $(top_builddir)/lib/crm/cib/libcib.la \ $(AISLIBS) \ $(GLIBLIB) \ $(LIBRT) -LIBRT = @LIBRT@ -AM_CFLAGS = @CFLAGS@ $(CRM_DEBUG_FLAGS) - - ## binary progs halib_PROGRAMS = tengine ttest ## SOURCES noinst_HEADERS = tengine.h te_callbacks.h tengine_SOURCES = actions.c events.c utils.c callbacks.c main.c tengine_LDADD = $(COMMONLIBS) \ -lstonithd \ $(top_builddir)/lib/crm/transition/libtransitioner.la ttest_SOURCES = actions.c events.c utils.c callbacks.c ttest.c ttest_LDADD = $(COMMONLIBS) \ -lstonithd \ $(top_builddir)/lib/crm/transition/libtransitioner.la clean-generic: rm -f *.log *.debug *~ install-exec-local: uninstall-local: