diff --git a/crm/ais/Makefile.am b/crm/ais/Makefile.am index b9f75fbeda..775c13f99f 100644 --- a/crm/ais/Makefile.am +++ b/crm/ais/Makefile.am @@ -1,51 +1,51 @@ # # Copyright (C) 2007 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$(AISPREFIX)/include/openais plugindir = $(libdir) plugin_LTLIBRARIES = service_crm.la #ais_PROGRAMS = atest -service_crm_la_SOURCES = utils.c plugin.c +service_crm_la_SOURCES = utils.c plugin.c utils.h plugin.h service_crm_la_LDFLAGS = -export-dynamic -module -avoid-version # Extra LDFLAGS: -bundle -bundle_loader /opt/local/sbin/aisexec -bind_at_load service_crm_la_LIBADD = $(GLIBLIB) COMMONLIBS = $(CRM_DEBUG_LIBS) \ $(top_builddir)/lib/clplumbing/libplumb.la \ $(top_builddir)/lib/crm/common/libcrmcommon.la \ $(GLIBLIB) \ $(CURSESLIBS) \ $(CLUSTERLIBS) \ $(LIBRT) #atest_SOURCES = test.c #atest_LDADD = $(COMMONLIBS) #CFLAGS that cant be used here: -ansi -Wcast-qual -Wwrite-strings CFLAGS = $(NON_FATAL_CFLAGS:-Wwrite-strings=) #POST_INSTALL = ls -al $(plugindir) install-exec-local: echo Ensure $(plugindir)/$(lib_LTLIBRARIES:.la=.so) is later linked/copied to $(LCRSODIR)/$(lib_LTLIBRARIES:.la=.lcrso) clean-generic: rm -f *.log *.debug *~ .gres.* testcases/.gres.* diff --git a/include/crm/Makefile.am b/include/crm/Makefile.am index b8b35f59df..0951f0bee2 100644 --- a/include/crm/Makefile.am +++ b/include/crm/Makefile.am @@ -1,24 +1,24 @@ # # 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 headerdir=$(includedir)/@PKG_NAME@/crm -header_HEADERS = crm.h cib.h msg_xml.h transition.h ais.h +header_HEADERS = crm.h cib.h msg_xml.h transition.h ais.h ais_common.h SUBDIRS = common pengine diff --git a/include/crm/common/Makefile.am b/include/crm/common/Makefile.am index c07bc616d5..34ba227eab 100644 --- a/include/crm/common/Makefile.am +++ b/include/crm/common/Makefile.am @@ -1,23 +1,23 @@ # # 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 headerdir=$(includedir)/@PKG_NAME@/crm/common -header_HEADERS = xml.h ipc.h msg.h ctrl.h util.h iso8601.h +header_HEADERS = xml.h ipc.h msg.h ctrl.h cluster.h util.h iso8601.h diff --git a/lib/crm/common/Makefile.am b/lib/crm/common/Makefile.am index 7cf81af65d..63ae459709 100644 --- a/lib/crm/common/Makefile.am +++ b/lib/crm/common/Makefile.am @@ -1,51 +1,51 @@ # # 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 ## libraries lib_LTLIBRARIES = libcrmcommon.la libcrmcluster.la -libcrmcluster_la_SOURCES = cluster.c membership.c +libcrmcluster_la_SOURCES = cluster.c membership.c stack.h if BUILD_AIS_SUPPORT libcrmcluster_la_SOURCES += ais.c endif if BUILD_HEARTBEAT_SUPPORT libcrmcluster_la_SOURCES += heartbeat.c endif libcrmcluster_la_LDFLAGS = -version-info 1:0:0 libcrmcommon_la_SOURCES = ipc.c utils.c xml.c ctrl.c iso8601.c \ iso8601_fields.c libcrmcommon_la_LDFLAGS = -version-info 2:0:0 clean-generic: rm -f *.log *.debug *.xml *~ install-exec-local: uninstall-local: