diff --git a/doc/Clusters_from_Scratch/en-US/Revision_History.xml b/doc/Clusters_from_Scratch/en-US/Revision_History.xml
index 59e961fc1d..19dd3191f6 100644
--- a/doc/Clusters_from_Scratch/en-US/Revision_History.xml
+++ b/doc/Clusters_from_Scratch/en-US/Revision_History.xml
@@ -1,55 +1,55 @@
%BOOK_ENTITIES;
]>
Revision History
- 1
+ 1-0
Mon May 17 2010
AndrewBeekhofandrew@beekhof.net
Import from Pages.app
- 2
+ 2-0
Wed Sep 22 2010
RaoulScarazzinirasca@miamammausalinux.org
Italian translation
- 3
+ 3-0
Wed Feb 9 2011
AndrewBeekhofandrew@beekhof.net
Updated for Fedora 13
- 4
+ 4-0
Wed Oct 5 2011
AndrewBeekhofandrew@beekhof.net
Update the GFS2 section to use CMAN
- 5
+ 5-0
Fri Feb 10 2012
AndrewBeekhofandrew@beekhof.net
Generate docbook content from asciidoc sources
- 6
+ 6-0
Tues July 3 2012
AndrewBeekhofandrew@beekhof.net
Updated for Fedora 17
- 7
+ 7-0
Fri Sept 14 2012
DavidVosseldvossel@redhat.com
Updated for pcs
diff --git a/doc/Pacemaker_Explained/en-US/Revision_History.xml b/doc/Pacemaker_Explained/en-US/Revision_History.xml
index a351d9c6cd..0afc90b237 100644
--- a/doc/Pacemaker_Explained/en-US/Revision_History.xml
+++ b/doc/Pacemaker_Explained/en-US/Revision_History.xml
@@ -1,47 +1,47 @@
Revision History
- 1
+ 1-0
19 Oct 2009
AndrewBeekhofandrew@beekhof.net
Import from Pages.app
- 2
+ 2-0
26 Oct 2009
AndrewBeekhofandrew@beekhof.net
Cleanup and reformatting of docbook xml complete
- 3
+ 3-0
Tue Nov 12 2009
AndrewBeekhofandrew@beekhof.net
Split book into chapters and pass validation
Re-organize book for use with Publican
- 4
+ 4-0
Mon Oct 8 2012
AndrewBeekhofandrew@beekhof.net
Converted to asciidoc
(which is converted to docbook for use with
Publican)
diff --git a/lib/cib/Makefile.am b/lib/cib/Makefile.am
index e8b4f4dab7..13cd596c1d 100644
--- a/lib/cib/Makefile.am
+++ b/lib/cib/Makefile.am
@@ -1,45 +1,44 @@
#
# 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
## libraries
lib_LTLIBRARIES = libcib.la
## SOURCES
noinst_HEADERS =
libcib_la_SOURCES = cib_ops.c cib_utils.c cib_client.c cib_native.c cib_attrs.c
libcib_la_SOURCES += cib_file.c cib_remote.c
if ENABLE_ACL
libcib_la_SOURCES += cib_acl.c
endif
-libcib_la_LDFLAGS = -version-info 3:1:0 $(top_builddir)/lib/common/libcrmcommon.la $(CRYPTOLIB) \
- $(top_builddir)/lib/pengine/libpe_rules.la
-
+libcib_la_LDFLAGS = -version-info 3:1:0 -L$(top_builddir)/lib/pengine/.libs
+libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
libcib_la_CFLAGS = -I$(top_srcdir)
clean-generic:
rm -f *.log *.debug *.xml *~
install-exec-local:
uninstall-local:
diff --git a/lib/pengine/Makefile.am b/lib/pengine/Makefile.am
index 68f28c61a3..6c0bb321e2 100644
--- a/lib/pengine/Makefile.am
+++ b/lib/pengine/Makefile.am
@@ -1,41 +1,42 @@
#
# 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
## libraries
lib_LTLIBRARIES = libpe_rules.la libpe_status.la
## SOURCES
noinst_HEADERS = unpack.h variant.h
libpe_rules_la_LDFLAGS = -version-info 2:2:0
libpe_rules_la_SOURCES = rules.c common.c
+libpe_rules_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
libpe_status_la_LDFLAGS = -version-info 6:0:2
libpe_status_la_SOURCES = status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
-libpe_status_la_LIBADD = @CURSESLIBS@
+libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
clean-generic:
rm -f *.log *.debug *~
install-exec-local:
uninstall-local:
diff --git a/lib/services/Makefile.am b/lib/services/Makefile.am
index bd5edffc11..67d7237409 100644
--- a/lib/services/Makefile.am
+++ b/lib/services/Makefile.am
@@ -1,39 +1,39 @@
# Copyright (c) 2012 David Vossel
#
# 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
INCLUDES = -I$(top_builddir)/include
lib_LTLIBRARIES = libcrmservice.la
noinst_HEADERS = upstart.h systemd.h services_private.h
libcrmservice_la_SOURCES = services.c services_linux.c
libcrmservice_la_LDFLAGS = -version-info 1:0:0
libcrmservice_la_CFLAGS = $(GIO_CFLAGS) -DOCF_ROOT_DIR=\"@OCF_ROOT_DIR@\"
-libcrmservice_la_LIBADD = $(GIO_LIBS)
+libcrmservice_la_LIBADD = $(GIO_LIBS) $(top_builddir)/lib/common/libcrmcommon.la
if BUILD_UPSTART
libcrmservice_la_SOURCES += upstart.c
endif
if BUILD_SYSTEMD
libcrmservice_la_SOURCES += systemd.c
endif
AM_CFLAGS = $(INCLUDES)
diff --git a/lib/transition/Makefile.am b/lib/transition/Makefile.am
index 73f0ef3c9f..da87e61682 100644
--- a/lib/transition/Makefile.am
+++ b/lib/transition/Makefile.am
@@ -1,38 +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
## libraries
lib_LTLIBRARIES = libtransitioner.la
## SOURCES
noinst_HEADERS =
libtransitioner_la_SOURCES = unpack.c graph.c utils.c
libtransitioner_la_LDFLAGS = -version-info 2:1:0
libtransitioner_la_CFLAGS = -I$(top_builddir)
+libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
clean-generic:
rm -f *~
install-exec-local:
uninstall-local: