diff --git a/attrd/Makefile.am b/attrd/Makefile.am
index 9a841e5679..a116e0ed4d 100644
--- a/attrd/Makefile.am
+++ b/attrd/Makefile.am
@@ -1,37 +1,37 @@
 #
 # Copyright (C) 2004-2009 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.
 #
 include $(top_srcdir)/Makefile.common
 
-halibdir		= $(CRM_DAEMON_DIR)
-halib_PROGRAMS		= attrd
+halibdir	= $(CRM_DAEMON_DIR)
+halib_PROGRAMS	= attrd
 ## SOURCES
 
-attrd_SOURCES		=
-attrd_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la 		\
-		$(top_builddir)/lib/common/libcrmcommon.la		\
-		$(top_builddir)/lib/cib/libcib.la			\
+attrd_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la	\
+		$(top_builddir)/lib/common/libcrmcommon.la	\
+		$(top_builddir)/lib/cib/libcib.la		\
 		$(CLUSTERLIBS)
 
+attrd_SOURCES	=
 if BUILD_ATOMIC_ATTRD
 attrd_SOURCES	+= main.c commands.c
 else
 attrd_SOURCES	+= legacy.c
 endif
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
diff --git a/cib/Makefile.am b/cib/Makefile.am
index 8508223beb..fcb8ce9bcb 100644
--- a/cib/Makefile.am
+++ b/cib/Makefile.am
@@ -1,50 +1,50 @@
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST	= cib.pam
 
 hadir		= $(sysconfdir)/ha.d
 halibdir	= $(CRM_DAEMON_DIR)
 commmoddir	= $(halibdir)/modules/comm
 
-COMMONLIBS	= $(top_builddir)/lib/common/libcrmcommon.la	\
-		  $(top_builddir)/lib/cib/libcib.la
+COMMONLIBS	= $(top_builddir)/lib/common/libcrmcommon.la \
+		$(top_builddir)/lib/cib/libcib.la
 
 ## binary progs
 halib_PROGRAMS	= cib cibmon
 
 ## SOURCES
-noinst_HEADERS          = callbacks.h cibio.h cibmessages.h common.h notify.h
+noinst_HEADERS	= callbacks.h cibio.h cibmessages.h common.h notify.h
 
-cib_SOURCES		= io.c messages.c notify.c	\
-			callbacks.c main.c remote.c common.c
+cib_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la \
+		$(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
 
-cib_LDADD		= $(top_builddir)/lib/cluster/libcrmcluster.la \
-			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
+cib_SOURCES	= io.c messages.c notify.c \
+		callbacks.c main.c remote.c common.c
 
-cibmon_SOURCES		= cibmon.c
-cibmon_LDADD		= $(COMMONLIBS)
+cibmon_LDADD	= $(COMMONLIBS)
+cibmon_SOURCES	= cibmon.c
 
 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/crmd/Makefile.am b/crmd/Makefile.am
index c28da0b897..979e266adc 100644
--- a/crmd/Makefile.am
+++ b/crmd/Makefile.am
@@ -1,63 +1,62 @@
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 ## binary progs
 halib_PROGRAMS	= crmd
 
 ## 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 \
+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 te_callbacks.h tengine.h
 
-crmd_SOURCES	= main.c crmd.c corosync.c notify.c				\
-		fsa.c control.c messages.c membership.c callbacks.c		\
-		election.c join_client.c join_dc.c subsystems.c throttle.c	\
-		cib.c pengine.c tengine.c lrm.c lrm_state.c remote_lrmd_ra.c	\
-		utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
-
-if BUILD_HEARTBEAT_SUPPORT
-crmd_SOURCES += heartbeat.c
-endif
-
 crmd_LDADD	= $(top_builddir)/lib/fencing/libstonithd.la		\
 		$(top_builddir)/lib/transition/libtransitioner.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		\
+		$(top_builddir)/lib/lrmd/liblrmd.la			\
 		$(CLUSTERLIBS)
 
+crmd_SOURCES	= main.c crmd.c corosync.c notify.c				\
+		fsa.c control.c messages.c membership.c callbacks.c		\
+		election.c join_client.c join_dc.c subsystems.c throttle.c	\
+		cib.c pengine.c tengine.c lrm.c lrm_state.c remote_lrmd_ra.c	\
+		utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
+if BUILD_HEARTBEAT_SUPPORT
+crmd_SOURCES += heartbeat.c
+endif
+
 if BUILD_XML_HELP
-man7_MANS =	crmd.7
+man7_MANS 	= crmd.7
 endif
 
-graphs:	fsa_inputs.png fsa_inputs_by_action.png fsa_actions_by_state.png
+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
+%.dot: fsa_matrix.h make_dot.pl
 	perl $(top_srcdir)/crmd/make_dot.pl $(top_srcdir)/crmd/fsa_matrix.h $(top_builddir)/crmd
 
 CLEANFILES = $(man7_MANS)
diff --git a/fencing/Makefile.am b/fencing/Makefile.am
index 79fe2ed99f..1d591fcea2 100644
--- a/fencing/Makefile.am
+++ b/fencing/Makefile.am
@@ -1,72 +1,74 @@
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
 ## binary progs
 testdir			= $(datadir)/$(PACKAGE)/tests/fencing
 test_SCRIPTS		= regression.py
 
 halibdir	= $(CRM_DAEMON_DIR)
 halib_PROGRAMS	= stonithd stonith-test
 
-sbin_PROGRAMS  = stonith_admin
-sbin_SCRIPTS   = fence_legacy fence_pcmk
+sbin_PROGRAMS	= stonith_admin
+sbin_SCRIPTS	= fence_legacy fence_pcmk
 
-noinst_HEADERS = internal.h
+noinst_HEADERS	= internal.h
 
 if BUILD_XML_HELP
-man7_MANS =	stonithd.7
+man7_MANS	= stonithd.7
 endif
 
 stonith_test_SOURCES	= test.c
 
 stonith_test_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
 stonith_admin_SOURCES	= admin.c
 
 stonith_admin_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cib/libcib.la		\
 			$(top_builddir)/lib/pengine/libpe_status.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
-stonithd_CFLAGS		= -I$(top_srcdir)/pengine
-stonithd_SOURCES	= main.c commands.c remote.c
-if BUILD_STONITH_CONFIG
-BUILT_SOURCES 		= standalone_config.h
-
-stonithd_SOURCES	+= standalone_config.c config.y config.l
-stonithd_AM_LFLAGS 	= -o$(LEX_OUTPUT_ROOT).c
-endif
-stonithd_YFLAGS 	= -d
+stonithd_CPPFLAGS	= -I$(top_srcdir)/pengine $(AM_CPPFLAGS)
+stonithd_YFLAGS		= -d
 
 stonithd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(top_builddir)/lib/pengine/libpe_status.la	\
-			$(top_builddir)/pengine/libpengine.la	\
+			$(top_builddir)/pengine/libpengine.la		\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
+stonithd_SOURCES	= main.c commands.c remote.c
+
+if BUILD_STONITH_CONFIG
+BUILT_SOURCES 		= standalone_config.h
+
+stonithd_SOURCES	+= standalone_config.c config.y config.l
+stonithd_AM_LFLAGS	= -o$(LEX_OUTPUT_ROOT).c
+endif
+
 # lex/yacc issues:
 CFLAGS			= $(CFLAGS_COPY:-Werror=)
 
 CLEANFILES = $(man7_MANS) $(man8_MANS)
diff --git a/lib/cib/Makefile.am b/lib/cib/Makefile.am
index 0c57eee773..e414a7fc67 100644
--- a/lib/cib/Makefile.am
+++ b/lib/cib/Makefile.am
@@ -1,32 +1,33 @@
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
 ## libraries
-lib_LTLIBRARIES	= libcib.la
+lib_LTLIBRARIES		= libcib.la
 
 ## SOURCES
 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
+libcib_la_SOURCES	+= cib_file.c cib_remote.c
 
 libcib_la_LDFLAGS	= -version-info 5:1:1
-libcib_la_LIBADD        = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
-libcib_la_CFLAGS	= -I$(top_srcdir)
+libcib_la_CPPFLAGS	= -I$(top_srcdir) $(AM_CPPFLAGS)
+
+libcib_la_LIBADD	= $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
diff --git a/lib/cluster/Makefile.am b/lib/cluster/Makefile.am
index ffa2a73415..06d706672b 100644
--- a/lib/cluster/Makefile.am
+++ b/lib/cluster/Makefile.am
@@ -1,42 +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.
 #
 include $(top_srcdir)/Makefile.common
 
 ## libraries
 lib_LTLIBRARIES	= libcrmcluster.la 
 
-libcrmcluster_la_SOURCES = election.c cluster.c membership.c
 libcrmcluster_la_LDFLAGS = -version-info 6:0:2
 libcrmcluster_la_LIBADD  = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la $(CLUSTERLIBS)
 
+libcrmcluster_la_SOURCES = election.c cluster.c membership.c
 if BUILD_CS_SUPPORT
 libcrmcluster_la_SOURCES += cpg.c
 if BUILD_CS_PLUGIN
 libcrmcluster_la_SOURCES += legacy.c
 else
 libcrmcluster_la_SOURCES += corosync.c
 endif
 endif
-
 if BUILD_HEARTBEAT_SUPPORT
 libcrmcluster_la_SOURCES += heartbeat.c
 #libcrmcluster_la_LIBADD  += -ldl
 endif
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 111628f95f..7550ec1cc5 100644
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -1,46 +1,46 @@
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS		+= -I$(top_builddir)/lib/gnu -I$(top_srcdir)/lib/gnu \
 			-DSBINDIR=\"$(sbindir)\"
 
 ## libraries
 lib_LTLIBRARIES	= libcrmcommon.la
 
 # Can't use -Wcast-qual here because glib insists on pretending things are const  
 # when they're not and thus we need the crm_element_value_const() hack
 
 # s390 needs -fPIC 
 # s390-suse-linux/bin/ld: .libs/ipc.o: relocation R_390_PC32DBL against `__stack_chk_fail@@GLIBC_2.4' can not be used when making a shared object; recompile with -fPIC
 
 CFLAGS		= $(CFLAGS_COPY:-Wcast-qual=) -fPIC
 
+libcrmcommon_la_LDFLAGS	= -version-info 9:0:6
+libcrmcommon_la_LIBADD	= @LIBADD_DL@ $(GNUTLSLIBS) -lm
+
 libcrmcommon_la_SOURCES	= compat.c digest.c ipc.c io.c procfs.c utils.c xml.c \
 			  iso8601.c remote.c mainloop.c logging.c watchdog.c \
 			  xpath.c
 if BUILD_CIBSECRETS
 libcrmcommon_la_SOURCES	+= cib_secrets.c
 endif
-
-libcrmcommon_la_LDFLAGS	= -version-info 9:0:6
-libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS) -lm
-libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
+libcrmcommon_la_SOURCES	+= $(top_builddir)/lib/gnu/md5.c
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
diff --git a/lib/fencing/Makefile.am b/lib/fencing/Makefile.am
index a9f9874554..85ae40ad4c 100644
--- a/lib/fencing/Makefile.am
+++ b/lib/fencing/Makefile.am
@@ -1,25 +1,25 @@
 #  File: Makefile.am
 #  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 #  Copyright (c) 2004 International Business Machines
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
-lib_LTLIBRARIES = libstonithd.la
+lib_LTLIBRARIES		= libstonithd.la
 
-libstonithd_la_SOURCES = st_client.c
-libstonithd_la_LDFLAGS = -version-info 4:1:2
-libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
+libstonithd_la_LDFLAGS	= -version-info 4:1:2
+libstonithd_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
+libstonithd_la_SOURCES	= st_client.c
diff --git a/lib/lrmd/Makefile.am b/lib/lrmd/Makefile.am
index c23fef543c..25f3d55ad1 100644
--- a/lib/lrmd/Makefile.am
+++ b/lib/lrmd/Makefile.am
@@ -1,25 +1,25 @@
 # Copyright (c) 2012 David Vossel <davidvossel@gmail.com>
 #
 # 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
 #
 include $(top_srcdir)/Makefile.common
 
-lib_LTLIBRARIES = liblrmd.la
+lib_LTLIBRARIES		= liblrmd.la
 
-liblrmd_la_SOURCES = lrmd_client.c proxy_common.c
-liblrmd_la_LDFLAGS = -version-info 4:0:3
-liblrmd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la	\
-			$(top_builddir)/lib/services/libcrmservice.la \
+liblrmd_la_LDFLAGS	= -version-info 4:0:3
+liblrmd_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
+			$(top_builddir)/lib/services/libcrmservice.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la
+liblrmd_la_SOURCES	= lrmd_client.c proxy_common.c
diff --git a/lib/pengine/Makefile.am b/lib/pengine/Makefile.am
index a0d19e5037..de760c3ec0 100644
--- a/lib/pengine/Makefile.am
+++ b/lib/pengine/Makefile.am
@@ -1,36 +1,36 @@
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
 ## libraries
-lib_LTLIBRARIES	= libpe_rules.la libpe_status.la
+lib_LTLIBRARIES		= libpe_rules.la libpe_status.la
 
 ## SOURCES
-noinst_HEADERS	= unpack.h variant.h
+noinst_HEADERS		= unpack.h variant.h
 
 libpe_rules_la_LDFLAGS	= -version-info 2:6:0
-libpe_rules_la_SOURCES	= rules.c common.c
 libpe_rules_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
+libpe_rules_la_SOURCES	= rules.c common.c
 
 libpe_status_la_LDFLAGS	= -version-info 11:0:1
-libpe_status_la_SOURCES	=  status.c unpack.c utils.c complex.c native.c \
-			   group.c clone.c rules.c common.c remote.c
-libpe_status_la_LIBADD	=  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
+libpe_status_la_LIBADD	= @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
+libpe_status_la_SOURCES	= status.c unpack.c utils.c complex.c native.c \
+			group.c clone.c rules.c common.c remote.c
 
 clean-generic:
 	rm -f *.log *.debug *~
diff --git a/lib/services/Makefile.am b/lib/services/Makefile.am
index 2797b53b09..c789fbdc88 100644
--- a/lib/services/Makefile.am
+++ b/lib/services/Makefile.am
@@ -1,41 +1,41 @@
 # Copyright (c) 2012 David Vossel <davidvossel@gmail.com>
 #
 # 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
 
-AM_CPPFLAGS         = -I$(top_builddir)/include
+AM_CPPFLAGS			= -I$(top_builddir)/include
 
-lib_LTLIBRARIES = libcrmservice.la
-noinst_HEADERS  = upstart.h systemd.h services_private.h
+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 4:1:1
-libcrmservice_la_CFLAGS  = $(GIO_CFLAGS) -DOCF_ROOT_DIR=\"@OCF_ROOT_DIR@\"
-libcrmservice_la_LIBADD  = $(GIO_LIBS) $(top_builddir)/lib/common/libcrmcommon.la $(DBUS_LIBS)
+libcrmservice_la_LDFLAGS	= -version-info 4:1:1
+libcrmservice_la_CPPFLAGS	= -DOCF_ROOT_DIR=\"@OCF_ROOT_DIR@\" $(AM_CPPFLAGS)
+libcrmservice_la_CFLAGS		= $(GIO_CFLAGS)
 
+libcrmservice_la_LIBADD		= $(GIO_LIBS) $(top_builddir)/lib/common/libcrmcommon.la $(DBUS_LIBS)
+
+libcrmservice_la_SOURCES	= services.c services_linux.c
 if BUILD_DBUS
-libcrmservice_la_SOURCES += dbus.c
+libcrmservice_la_SOURCES	+= dbus.c
 endif
-
 if BUILD_UPSTART
-libcrmservice_la_SOURCES += upstart.c
+libcrmservice_la_SOURCES	+= upstart.c
 endif
-
 if BUILD_SYSTEMD
-libcrmservice_la_SOURCES += systemd.c
+libcrmservice_la_SOURCES	+= systemd.c
 endif
diff --git a/lib/transition/Makefile.am b/lib/transition/Makefile.am
index 7bcfc1a37c..9bc039e714 100644
--- a/lib/transition/Makefile.am
+++ b/lib/transition/Makefile.am
@@ -1,31 +1,32 @@
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
 ## libraries
-lib_LTLIBRARIES	= libtransitioner.la
+lib_LTLIBRARIES			= libtransitioner.la
 
 ## SOURCES
-libtransitioner_la_SOURCES	= unpack.c graph.c utils.c
 
 libtransitioner_la_LDFLAGS	= -version-info 2:5:0
-libtransitioner_la_CFLAGS	= -I$(top_builddir)
-libtransitioner_la_LIBADD       = $(top_builddir)/lib/common/libcrmcommon.la
+libtransitioner_la_CPPFLAGS	= -I$(top_builddir) $(AM_CPPFLAGS)
+
+libtransitioner_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
+libtransitioner_la_SOURCES	= unpack.c graph.c utils.c
 
 clean-generic:
 	rm -f *~
diff --git a/lrmd/Makefile.am b/lrmd/Makefile.am
index 556d48a040..64df1058ea 100644
--- a/lrmd/Makefile.am
+++ b/lrmd/Makefile.am
@@ -1,64 +1,62 @@
 # Copyright (c) 2012 David Vossel <davidvossel@gmail.com>
 #
 # 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
 #
 include $(top_srcdir)/Makefile.common
 
 testdir			= $(datadir)/$(PACKAGE)/tests/lrmd
 test_SCRIPTS		= regression.py
 
-lrmdlibdir	= $(CRM_DAEMON_DIR)
-lrmdlib_PROGRAMS = lrmd lrmd_test lrmd_internal_ctl
+lrmdlibdir		= $(CRM_DAEMON_DIR)
+lrmdlib_PROGRAMS	= lrmd lrmd_test lrmd_internal_ctl
 
-initdir		 = $(INITDIR)
-init_SCRIPTS	 = pacemaker_remote
-sbin_PROGRAMS	 = pacemaker_remoted
+initdir			= $(INITDIR)
+init_SCRIPTS		= pacemaker_remote
+sbin_PROGRAMS		= pacemaker_remoted
 
 if BUILD_SYSTEMD
-systemdunit_DATA = pacemaker_remote.service
+systemdunit_DATA	= pacemaker_remote.service
 endif
 
-lrmd_SOURCES	= main.c lrmd.c
 lrmd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
-			$(top_builddir)/lib/services/libcrmservice.la \
-			$(top_builddir)/lib/lrmd/liblrmd.la  \
+			$(top_builddir)/lib/services/libcrmservice.la	\
+			$(top_builddir)/lib/lrmd/liblrmd.la		\
 			$(top_builddir)/lib/fencing/libstonithd.la ${COMPAT_LIBS}
+lrmd_SOURCES		= main.c lrmd.c
 
+pacemaker_remoted_CPPFLAGS	= -DSUPPORT_REMOTE $(AM_CPPFLAGS)
 
-pacemaker_remoted_SOURCES	= main.c lrmd.c tls_backend.c ipc_proxy.c
-pacemaker_remoted_CFLAGS	= -DSUPPORT_REMOTE
 pacemaker_remoted_LDADD		= $(lrmd_LDADD)
+pacemaker_remoted_SOURCES	= main.c lrmd.c tls_backend.c ipc_proxy.c
 
-
+lrmd_internal_ctl_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
+				$(top_builddir)/lib/lrmd/liblrmd.la		\
+				$(top_builddir)/lib/cib/libcib.la		\
+				$(top_builddir)/lib/services/libcrmservice.la	\
+				$(top_builddir)/lib/pengine/libpe_status.la	\
+				$(top_builddir)/pengine/libpengine.la
 lrmd_internal_ctl_SOURCES	= remote_ctl.c
-lrmd_internal_ctl_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
-			$(top_builddir)/lib/lrmd/liblrmd.la  \
-			$(top_builddir)/lib/cib/libcib.la   \
-			$(top_builddir)/lib/services/libcrmservice.la \
-			$(top_builddir)/lib/pengine/libpe_status.la \
-			$(top_builddir)/pengine/libpengine.la
 
-
-lrmd_test_SOURCES	= test.c
 lrmd_test_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
-			$(top_builddir)/lib/lrmd/liblrmd.la  \
-			$(top_builddir)/lib/cib/libcib.la   \
-			$(top_builddir)/lib/services/libcrmservice.la \
-			$(top_builddir)/lib/pengine/libpe_status.la \
+			$(top_builddir)/lib/lrmd/liblrmd.la		\
+			$(top_builddir)/lib/cib/libcib.la		\
+			$(top_builddir)/lib/services/libcrmservice.la	\
+			$(top_builddir)/lib/pengine/libpe_status.la	\
 			$(top_builddir)/pengine/libpengine.la
+lrmd_test_SOURCES	= test.c
 
 noinst_HEADERS  = lrmd_private.h
 
 CLEANFILES = $(man8_MANS)
diff --git a/mcp/Makefile.am b/mcp/Makefile.am
index 1b3720ac5d..195530a04d 100644
--- a/mcp/Makefile.am
+++ b/mcp/Makefile.am
@@ -1,40 +1,40 @@
 #
 # Copyright (C) 2004-2009 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.
 #
 include $(top_srcdir)/Makefile.common
 
 if BUILD_CS_SUPPORT
 
 initdir			= $(INITDIR)
 init_SCRIPTS		= pacemaker
 sbin_PROGRAMS		= pacemakerd
 
 if BUILD_SYSTEMD
-systemdunit_DATA = pacemaker.service
+systemdunit_DATA	= pacemaker.service
 endif
 
 ## SOURCES
 
 noinst_HEADERS		= pacemaker.h
 
-pacemakerd_SOURCES	= pacemaker.c corosync.c 
 pacemakerd_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la
 pacemakerd_LDADD	+= $(CLUSTERLIBS)
+pacemakerd_SOURCES	= pacemaker.c corosync.c
 
 endif
 
 CLEANFILES = $(man8_MANS)
diff --git a/pengine/Makefile.am b/pengine/Makefile.am
index 170b728b72..96c914f6c8 100644
--- a/pengine/Makefile.am
+++ b/pengine/Makefile.am
@@ -1,86 +1,84 @@
 #
 # 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.
 #
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS     += -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS	+= -I$(top_builddir) -I$(top_srcdir)
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 PE_TESTS	= $(wildcard test10/*.scores)
 
 testdir			= $(datadir)/$(PACKAGE)/tests/pengine
 test_SCRIPTS		= regression.sh
 test_DATA		= regression.core.sh
 
 test10dir		= $(datadir)/$(PACKAGE)/tests/pengine/test10
 test10_DATA		= $(PE_TESTS) $(PE_TESTS:%.scores=%.xml) $(PE_TESTS:%.scores=%.exp) $(PE_TESTS:%.scores=%.dot) $(PE_TESTS:%.scores=%.summary) $(wildcard test10/*.stderr)
 
-COMMONLIBS	= 					\
-		$(top_builddir)/lib/common/libcrmcommon.la		\
-		$(top_builddir)/lib/pengine/libpe_status.la		\
+COMMONLIBS	= $(top_builddir)/lib/common/libcrmcommon.la	\
+		$(top_builddir)/lib/pengine/libpe_status.la	\
 		libpengine.la $(CURSESLIBS) $(CLUSTERLIBS)
 
 beekhof:
 	echo $(shell ls -1 test10/*.xml)
 
 #TESTS = test10/*.xml
 TESTS = test10/bug-rh-1097457.xml
 TEST_EXTENSIONS = .xml
 XML_LOG_COMPILER = ./regression.sh
 AM_XML_LOG_FLAGS = -V --run 
 #LOG_COMPILER = 
 #AM_LOG_FLAGS = -V
 
 
 ## libraries
 lib_LTLIBRARIES	= libpengine.la
 
 ## binary progs
 halib_PROGRAMS	= pengine
 
 if BUILD_XML_HELP
 man7_MANS =	pengine.7
 endif
 
 ## SOURCES
 
 noinst_HEADERS	= allocate.h utils.h pengine.h
 
 libpengine_la_LDFLAGS	= -version-info 11:0:1
+libpengine_la_LIBADD	= $(top_builddir)/lib/pengine/libpe_status.la \
+			$(top_builddir)/lib/cib/libcib.la
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
 libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c
-libpengine_la_SOURCES  += native.c group.c clone.c master.c graph.c utilization.c
+libpengine_la_SOURCES	+= native.c group.c clone.c master.c graph.c utilization.c
 
-libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la \
-	$(top_builddir)/lib/cib/libcib.la
-
-pengine_SOURCES	= main.c
 pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
 # libcib for get_object_root()
 #		$(top_builddir)/lib/hbclient/libhbclient.la
+pengine_SOURCES	= main.c
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
 	-chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)
 	-chgrp $(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
 	-chmod 750 $(DESTDIR)/$(PE_STATE_DIR)
 
 uninstall-local:
 
 clean-local:
 	rm -f test10/*.pe.* $(man7_MANS)