|
 |
fada68 |
From d720014c2cf7ff00004b64ca9cf817ffc00e6ffb Mon Sep 17 00:00:00 2001
|
|
|
fada68 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
fada68 |
Date: Fri, 10 Jun 2016 15:00:03 +0200
|
|
|
fada68 |
Subject: [PATCH 1/5] Build: Makefile.common to define MAINTAINERCLEANFILES +
|
|
|
fada68 |
AM_CPPFLAGS
|
|
|
fada68 |
|
|
|
fada68 |
Fallout after 89fba95.
|
|
|
fada68 |
---
|
|
|
fada68 |
attrd/Makefile.am | 5 +----
|
|
|
fada68 |
lib/cib/Makefile.am | 5 +----
|
|
|
fada68 |
lib/cluster/Makefile.am | 5 +----
|
|
|
fada68 |
lib/common/Makefile.am | 8 +++-----
|
|
|
fada68 |
lib/fencing/Makefile.am | 6 +-----
|
|
|
fada68 |
lib/lrmd/Makefile.am | 8 +-------
|
|
|
fada68 |
lib/pengine/Makefile.am | 5 +----
|
|
|
fada68 |
lib/transition/Makefile.am | 5 +----
|
|
|
fada68 |
lrmd/Makefile.am | 1 -
|
|
|
fada68 |
9 files changed, 10 insertions(+), 38 deletions(-)
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/attrd/Makefile.am b/attrd/Makefile.am
|
|
|
fada68 |
index 9d5e223..0c5d456 100644
|
|
|
fada68 |
--- a/attrd/Makefile.am
|
|
|
fada68 |
+++ b/attrd/Makefile.am
|
|
|
fada68 |
@@ -15,10 +15,7 @@
|
|
|
fada68 |
# along with this program; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
fada68 |
#
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
halibdir = $(CRM_DAEMON_DIR)
|
|
|
fada68 |
halib_PROGRAMS = attrd
|
|
|
fada68 |
diff --git a/lib/cib/Makefile.am b/lib/cib/Makefile.am
|
|
|
fada68 |
index 1ebd7b0..687b9f3 100644
|
|
|
fada68 |
--- a/lib/cib/Makefile.am
|
|
|
fada68 |
+++ b/lib/cib/Makefile.am
|
|
|
fada68 |
@@ -15,10 +15,7 @@
|
|
|
fada68 |
# along with this program; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
fada68 |
#
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
## libraries
|
|
|
fada68 |
lib_LTLIBRARIES = libcib.la
|
|
|
fada68 |
diff --git a/lib/cluster/Makefile.am b/lib/cluster/Makefile.am
|
|
|
fada68 |
index 5b6f3f7..f5f40bc 100644
|
|
|
fada68 |
--- a/lib/cluster/Makefile.am
|
|
|
fada68 |
+++ b/lib/cluster/Makefile.am
|
|
|
fada68 |
@@ -15,10 +15,7 @@
|
|
|
fada68 |
# along with this program; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
fada68 |
#
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
headerdir=$(pkgincludedir)/crm/cluster
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
|
|
|
fada68 |
index 8ef08db..7ae1dc8 100644
|
|
|
fada68 |
--- a/lib/common/Makefile.am
|
|
|
fada68 |
+++ b/lib/common/Makefile.am
|
|
|
fada68 |
@@ -15,12 +15,10 @@
|
|
|
fada68 |
# along with this program; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
fada68 |
#
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
|
|
|
fada68 |
- -I$(top_builddir)/lib/gnu -I$(top_srcdir)/lib/gnu \
|
|
|
fada68 |
- -DSBINDIR=\"$(sbindir)\"
|
|
|
fada68 |
+AM_CPPFLAGS += -I$(top_builddir)/lib/gnu -I$(top_srcdir)/lib/gnu \
|
|
|
fada68 |
+ -DSBINDIR=\"$(sbindir)\"
|
|
|
fada68 |
|
|
|
fada68 |
## libraries
|
|
|
fada68 |
lib_LTLIBRARIES = libcrmcommon.la
|
|
|
fada68 |
diff --git a/lib/fencing/Makefile.am b/lib/fencing/Makefile.am
|
|
|
fada68 |
index 3320466..aa57ba5 100644
|
|
|
fada68 |
--- a/lib/fencing/Makefile.am
|
|
|
fada68 |
+++ b/lib/fencing/Makefile.am
|
|
|
fada68 |
@@ -16,11 +16,7 @@
|
|
|
fada68 |
# along with this program; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
fada68 |
#
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
|
|
|
fada68 |
- -I$(top_builddir) -I$(top_srcdir)
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
lib_LTLIBRARIES = libstonithd.la
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/lib/lrmd/Makefile.am b/lib/lrmd/Makefile.am
|
|
|
fada68 |
index d5ae2f4..8c76a78 100644
|
|
|
fada68 |
--- a/lib/lrmd/Makefile.am
|
|
|
fada68 |
+++ b/lib/lrmd/Makefile.am
|
|
|
fada68 |
@@ -14,13 +14,7 @@
|
|
|
fada68 |
# License along with this library; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
fada68 |
#
|
|
|
fada68 |
-#
|
|
|
fada68 |
-
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
|
|
|
fada68 |
- -I$(top_builddir) -I$(top_srcdir)
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
lib_LTLIBRARIES = liblrmd.la
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/lib/pengine/Makefile.am b/lib/pengine/Makefile.am
|
|
|
fada68 |
index b9191d5..4544377 100644
|
|
|
fada68 |
--- a/lib/pengine/Makefile.am
|
|
|
fada68 |
+++ b/lib/pengine/Makefile.am
|
|
|
fada68 |
@@ -15,10 +15,7 @@
|
|
|
fada68 |
# along with this program; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
fada68 |
#
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
## libraries
|
|
|
fada68 |
lib_LTLIBRARIES = libpe_rules.la libpe_status.la
|
|
|
fada68 |
diff --git a/lib/transition/Makefile.am b/lib/transition/Makefile.am
|
|
|
fada68 |
index 4447f1b..6cc9bca 100644
|
|
|
fada68 |
--- a/lib/transition/Makefile.am
|
|
|
fada68 |
+++ b/lib/transition/Makefile.am
|
|
|
fada68 |
@@ -15,10 +15,7 @@
|
|
|
fada68 |
# along with this program; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
fada68 |
#
|
|
|
fada68 |
-MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
fada68 |
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
|
|
|
fada68 |
+include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
## libraries
|
|
|
fada68 |
lib_LTLIBRARIES = libtransitioner.la
|
|
|
fada68 |
diff --git a/lrmd/Makefile.am b/lrmd/Makefile.am
|
|
|
fada68 |
index a8fb07a..556d48a 100644
|
|
|
fada68 |
--- a/lrmd/Makefile.am
|
|
|
fada68 |
+++ b/lrmd/Makefile.am
|
|
|
fada68 |
@@ -14,7 +14,6 @@
|
|
|
fada68 |
# License along with this library; if not, write to the Free Software
|
|
|
fada68 |
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
fada68 |
#
|
|
|
fada68 |
-
|
|
|
fada68 |
include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
testdir = $(datadir)/$(PACKAGE)/tests/lrmd
|
|
|
fada68 |
--
|
|
|
fada68 |
1.8.3.1
|
|
|
fada68 |
|
|
|
fada68 |
|
|
|
fada68 |
From bfad92c9e23f3bf7a73e86017eed46ba7fd63c12 Mon Sep 17 00:00:00 2001
|
|
|
fada68 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
fada68 |
Date: Fri, 10 Jun 2016 17:38:46 +0200
|
|
|
fada68 |
Subject: [PATCH 2/5] Build: Makefile.am files: drop extraneous variables +
|
|
|
fada68 |
targets
|
|
|
fada68 |
|
|
|
fada68 |
- empty variables
|
|
|
fada68 |
- non-fitting .PHONY definitions
|
|
|
fada68 |
- unemployed install-exec-local + uninstall-local target pairs (per file)
|
|
|
fada68 |
- AM_CFLAGS unnecessarily initialized with current AM_CPPFLAGS value
|
|
|
fada68 |
- empty header_HEADERS variable + superfluous headerdir definition
|
|
|
fada68 |
---
|
|
|
fada68 |
Makefile.am | 2 --
|
|
|
fada68 |
attrd/Makefile.am | 8 --------
|
|
|
fada68 |
fencing/Makefile.am | 2 --
|
|
|
fada68 |
include/crm/Makefile.am | 1 -
|
|
|
fada68 |
include/crm/fencing/Makefile.am | 3 ---
|
|
|
fada68 |
lib/cib/Makefile.am | 5 -----
|
|
|
fada68 |
lib/cluster/Makefile.am | 8 --------
|
|
|
fada68 |
lib/common/Makefile.am | 4 ----
|
|
|
fada68 |
lib/fencing/Makefile.am | 2 --
|
|
|
fada68 |
lib/lrmd/Makefile.am | 3 ---
|
|
|
fada68 |
lib/pengine/Makefile.am | 4 ----
|
|
|
fada68 |
lib/services/Makefile.am | 2 --
|
|
|
fada68 |
lib/transition/Makefile.am | 5 -----
|
|
|
fada68 |
tools/Makefile.am | 11 -----------
|
|
|
fada68 |
14 files changed, 60 deletions(-)
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
fada68 |
index 0edf0c9..5d1a689 100644
|
|
|
fada68 |
--- a/Makefile.am
|
|
|
fada68 |
+++ b/Makefile.am
|
|
|
fada68 |
@@ -73,5 +73,3 @@ dist-clean-local:
|
|
|
fada68 |
|
|
|
fada68 |
maintainer-clean-local:
|
|
|
fada68 |
rm -f libltdl.tar
|
|
|
fada68 |
-
|
|
|
fada68 |
-.PHONY: rpm pkg handy handy-copy
|
|
|
fada68 |
diff --git a/attrd/Makefile.am b/attrd/Makefile.am
|
|
|
fada68 |
index 0c5d456..9a841e5 100644
|
|
|
fada68 |
--- a/attrd/Makefile.am
|
|
|
fada68 |
+++ b/attrd/Makefile.am
|
|
|
fada68 |
@@ -21,8 +21,6 @@ halibdir = $(CRM_DAEMON_DIR)
|
|
|
fada68 |
halib_PROGRAMS = attrd
|
|
|
fada68 |
## SOURCES
|
|
|
fada68 |
|
|
|
fada68 |
-noinst_HEADERS =
|
|
|
fada68 |
-
|
|
|
fada68 |
attrd_SOURCES =
|
|
|
fada68 |
attrd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la \
|
|
|
fada68 |
$(top_builddir)/lib/common/libcrmcommon.la \
|
|
|
fada68 |
@@ -37,9 +35,3 @@ endif
|
|
|
fada68 |
|
|
|
fada68 |
clean-generic:
|
|
|
fada68 |
rm -f *.log *.debug *.xml *~
|
|
|
fada68 |
-
|
|
|
fada68 |
-install-exec-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-uninstall-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-.PHONY: install-exec-hook
|
|
|
fada68 |
diff --git a/fencing/Makefile.am b/fencing/Makefile.am
|
|
|
fada68 |
index 383c217..bef6e6e 100644
|
|
|
fada68 |
--- a/fencing/Makefile.am
|
|
|
fada68 |
+++ b/fencing/Makefile.am
|
|
|
fada68 |
@@ -17,8 +17,6 @@
|
|
|
fada68 |
#
|
|
|
fada68 |
include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
-SUBDIRS =
|
|
|
fada68 |
-
|
|
|
fada68 |
## binary progs
|
|
|
fada68 |
testdir = $(datadir)/$(PACKAGE)/tests/fencing
|
|
|
fada68 |
test_SCRIPTS = regression.py
|
|
|
fada68 |
diff --git a/include/crm/Makefile.am b/include/crm/Makefile.am
|
|
|
fada68 |
index ef96011..bdb627c 100644
|
|
|
fada68 |
--- a/include/crm/Makefile.am
|
|
|
fada68 |
+++ b/include/crm/Makefile.am
|
|
|
fada68 |
@@ -19,7 +19,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
|
|
|
fada68 |
headerdir=$(pkgincludedir)/crm
|
|
|
fada68 |
|
|
|
fada68 |
-noinst_HEADERS =
|
|
|
fada68 |
header_HEADERS = crm.h cib.h attrd.h msg_xml.h transition.h stonith-ng.h cluster.h lrmd.h services.h error.h compatibility.h
|
|
|
fada68 |
|
|
|
fada68 |
SUBDIRS = common pengine cib fencing cluster
|
|
|
fada68 |
diff --git a/include/crm/fencing/Makefile.am b/include/crm/fencing/Makefile.am
|
|
|
fada68 |
index f85c842..57a787b 100644
|
|
|
fada68 |
--- a/include/crm/fencing/Makefile.am
|
|
|
fada68 |
+++ b/include/crm/fencing/Makefile.am
|
|
|
fada68 |
@@ -17,7 +17,4 @@
|
|
|
fada68 |
#
|
|
|
fada68 |
MAINTAINERCLEANFILES = Makefile.in
|
|
|
fada68 |
|
|
|
fada68 |
-headerdir=$(pkgincludedir)/crm/fencing
|
|
|
fada68 |
-
|
|
|
fada68 |
noinst_HEADERS = internal.h
|
|
|
fada68 |
-header_HEADERS =
|
|
|
fada68 |
diff --git a/lib/cib/Makefile.am b/lib/cib/Makefile.am
|
|
|
fada68 |
index 687b9f3..07bf261 100644
|
|
|
fada68 |
--- a/lib/cib/Makefile.am
|
|
|
fada68 |
+++ b/lib/cib/Makefile.am
|
|
|
fada68 |
@@ -21,7 +21,6 @@ include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
lib_LTLIBRARIES = libcib.la
|
|
|
fada68 |
|
|
|
fada68 |
## SOURCES
|
|
|
fada68 |
-noinst_HEADERS =
|
|
|
fada68 |
libcib_la_SOURCES = cib_ops.c cib_utils.c cib_client.c cib_native.c cib_attrs.c
|
|
|
fada68 |
libcib_la_SOURCES += cib_file.c cib_remote.c
|
|
|
fada68 |
|
|
|
fada68 |
@@ -31,7 +30,3 @@ libcib_la_CFLAGS = -I$(top_srcdir)
|
|
|
fada68 |
|
|
|
fada68 |
clean-generic:
|
|
|
fada68 |
rm -f *.log *.debug *.xml *~
|
|
|
fada68 |
-
|
|
|
fada68 |
-install-exec-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-uninstall-local:
|
|
|
fada68 |
diff --git a/lib/cluster/Makefile.am b/lib/cluster/Makefile.am
|
|
|
fada68 |
index f5f40bc..dcc1fbd 100644
|
|
|
fada68 |
--- a/lib/cluster/Makefile.am
|
|
|
fada68 |
+++ b/lib/cluster/Makefile.am
|
|
|
fada68 |
@@ -17,10 +17,6 @@
|
|
|
fada68 |
#
|
|
|
fada68 |
include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
|
|
|
fada68 |
-headerdir=$(pkgincludedir)/crm/cluster
|
|
|
fada68 |
-
|
|
|
fada68 |
-header_HEADERS =
|
|
|
fada68 |
-
|
|
|
fada68 |
## libraries
|
|
|
fada68 |
lib_LTLIBRARIES = libcrmcluster.la
|
|
|
fada68 |
|
|
|
fada68 |
@@ -45,7 +41,3 @@ endif
|
|
|
fada68 |
|
|
|
fada68 |
clean-generic:
|
|
|
fada68 |
rm -f *.log *.debug *.xml *~
|
|
|
fada68 |
-
|
|
|
fada68 |
-install-exec-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-uninstall-local:
|
|
|
fada68 |
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
|
|
|
fada68 |
index 7ae1dc8..111628f 100644
|
|
|
fada68 |
--- a/lib/common/Makefile.am
|
|
|
fada68 |
+++ b/lib/common/Makefile.am
|
|
|
fada68 |
@@ -44,7 +44,3 @@ libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
|
|
|
fada68 |
|
|
|
fada68 |
clean-generic:
|
|
|
fada68 |
rm -f *.log *.debug *.xml *~
|
|
|
fada68 |
-
|
|
|
fada68 |
-install-exec-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-uninstall-local:
|
|
|
fada68 |
diff --git a/lib/fencing/Makefile.am b/lib/fencing/Makefile.am
|
|
|
fada68 |
index aa57ba5..a9f9874 100644
|
|
|
fada68 |
--- a/lib/fencing/Makefile.am
|
|
|
fada68 |
+++ b/lib/fencing/Makefile.am
|
|
|
fada68 |
@@ -23,5 +23,3 @@ lib_LTLIBRARIES = libstonithd.la
|
|
|
fada68 |
libstonithd_la_SOURCES = st_client.c
|
|
|
fada68 |
libstonithd_la_LDFLAGS = -version-info 4:1:2
|
|
|
fada68 |
libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CFLAGS = $(AM_CPPFLAGS)
|
|
|
fada68 |
diff --git a/lib/lrmd/Makefile.am b/lib/lrmd/Makefile.am
|
|
|
fada68 |
index 8c76a78..c23fef5 100644
|
|
|
fada68 |
--- a/lib/lrmd/Makefile.am
|
|
|
fada68 |
+++ b/lib/lrmd/Makefile.am
|
|
|
fada68 |
@@ -23,6 +23,3 @@ liblrmd_la_LDFLAGS = -version-info 4:0:3
|
|
|
fada68 |
liblrmd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la \
|
|
|
fada68 |
$(top_builddir)/lib/services/libcrmservice.la \
|
|
|
fada68 |
$(top_builddir)/lib/fencing/libstonithd.la
|
|
|
fada68 |
-
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CFLAGS = $(AM_CPPFLAGS)
|
|
|
fada68 |
diff --git a/lib/pengine/Makefile.am b/lib/pengine/Makefile.am
|
|
|
fada68 |
index 4544377..a0d19e5 100644
|
|
|
fada68 |
--- a/lib/pengine/Makefile.am
|
|
|
fada68 |
+++ b/lib/pengine/Makefile.am
|
|
|
fada68 |
@@ -34,7 +34,3 @@ libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.l
|
|
|
fada68 |
|
|
|
fada68 |
clean-generic:
|
|
|
fada68 |
rm -f *.log *.debug *~
|
|
|
fada68 |
-
|
|
|
fada68 |
-install-exec-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-uninstall-local:
|
|
|
fada68 |
diff --git a/lib/services/Makefile.am b/lib/services/Makefile.am
|
|
|
fada68 |
index a9fe26d..2797b53 100644
|
|
|
fada68 |
--- a/lib/services/Makefile.am
|
|
|
fada68 |
+++ b/lib/services/Makefile.am
|
|
|
fada68 |
@@ -39,5 +39,3 @@ endif
|
|
|
fada68 |
if BUILD_SYSTEMD
|
|
|
fada68 |
libcrmservice_la_SOURCES += systemd.c
|
|
|
fada68 |
endif
|
|
|
fada68 |
-
|
|
|
fada68 |
-AM_CFLAGS = $(AM_CPPFLAGS)
|
|
|
fada68 |
diff --git a/lib/transition/Makefile.am b/lib/transition/Makefile.am
|
|
|
fada68 |
index 6cc9bca..7bcfc1a 100644
|
|
|
fada68 |
--- a/lib/transition/Makefile.am
|
|
|
fada68 |
+++ b/lib/transition/Makefile.am
|
|
|
fada68 |
@@ -21,7 +21,6 @@ include $(top_srcdir)/Makefile.common
|
|
|
fada68 |
lib_LTLIBRARIES = libtransitioner.la
|
|
|
fada68 |
|
|
|
fada68 |
## SOURCES
|
|
|
fada68 |
-noinst_HEADERS =
|
|
|
fada68 |
libtransitioner_la_SOURCES = unpack.c graph.c utils.c
|
|
|
fada68 |
|
|
|
fada68 |
libtransitioner_la_LDFLAGS = -version-info 2:5:0
|
|
|
fada68 |
@@ -30,7 +29,3 @@ libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
|
|
|
fada68 |
|
|
|
fada68 |
clean-generic:
|
|
|
fada68 |
rm -f *~
|
|
|
fada68 |
-
|
|
|
fada68 |
-install-exec-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-uninstall-local:
|
|
|
fada68 |
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
|
|
fada68 |
index 555b1db..59ce743 100644
|
|
|
fada68 |
--- a/tools/Makefile.am
|
|
|
fada68 |
+++ b/tools/Makefile.am
|
|
|
fada68 |
@@ -26,9 +26,6 @@ COMMONLIBS = \
|
|
|
fada68 |
$(top_builddir)/lib/cib/libcib.la \
|
|
|
fada68 |
$(CURSESLIBS) $(CLUSTERLIBS)
|
|
|
fada68 |
|
|
|
fada68 |
-headerdir = $(pkgincludedir)/crm
|
|
|
fada68 |
-header_HEADERS =
|
|
|
fada68 |
-
|
|
|
fada68 |
pcmkdir = $(datadir)/$(PACKAGE)
|
|
|
fada68 |
pcmk_DATA = report.common report.collector
|
|
|
fada68 |
|
|
|
fada68 |
@@ -57,8 +54,6 @@ endif
|
|
|
fada68 |
|
|
|
fada68 |
## SOURCES
|
|
|
fada68 |
|
|
|
fada68 |
-noinst_HEADERS =
|
|
|
fada68 |
-
|
|
|
fada68 |
MAN8DEPS = crm_attribute crm_node
|
|
|
fada68 |
|
|
|
fada68 |
crmadmin_SOURCES = crmadmin.c
|
|
|
fada68 |
@@ -143,10 +138,4 @@ ipmiservicelogd_CFLAGS = $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS)
|
|
|
fada68 |
ipmiservicelogd_LDFLAGS = $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
|
|
|
fada68 |
endif
|
|
|
fada68 |
|
|
|
fada68 |
-install-exec-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-uninstall-local:
|
|
|
fada68 |
-
|
|
|
fada68 |
-.PHONY: install-exec-hook
|
|
|
fada68 |
-
|
|
|
fada68 |
CLEANFILES = $(man8_MANS)
|
|
|
fada68 |
--
|
|
|
fada68 |
1.8.3.1
|
|
|
fada68 |
|
|
|
fada68 |
|
|
|
fada68 |
From 048efbf21a84568816b35522ed5f7b84f9ffdc41 Mon Sep 17 00:00:00 2001
|
|
|
fada68 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
fada68 |
Date: Mon, 20 Jun 2016 15:10:34 +0200
|
|
|
fada68 |
Subject: [PATCH 3/5] Build: drop superfluous libcrmcluster_la_DEPENDENCIES var
|
|
|
fada68 |
|
|
|
fada68 |
---
|
|
|
fada68 |
lib/cluster/Makefile.am | 1 -
|
|
|
fada68 |
1 file changed, 1 deletion(-)
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/lib/cluster/Makefile.am b/lib/cluster/Makefile.am
|
|
|
fada68 |
index dcc1fbd..ffa2a73 100644
|
|
|
fada68 |
--- a/lib/cluster/Makefile.am
|
|
|
fada68 |
+++ b/lib/cluster/Makefile.am
|
|
|
fada68 |
@@ -23,7 +23,6 @@ lib_LTLIBRARIES = libcrmcluster.la
|
|
|
fada68 |
libcrmcluster_la_SOURCES = election.c cluster.c membership.c
|
|
|
fada68 |
libcrmcluster_la_LDFLAGS = -version-info 6:0:2
|
|
|
fada68 |
libcrmcluster_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la $(CLUSTERLIBS)
|
|
|
fada68 |
-libcrmcluster_la_DEPENDENCIES = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la
|
|
|
fada68 |
|
|
|
fada68 |
if BUILD_CS_SUPPORT
|
|
|
fada68 |
libcrmcluster_la_SOURCES += cpg.c
|
|
|
fada68 |
--
|
|
|
fada68 |
1.8.3.1
|
|
|
fada68 |
|
|
|
fada68 |
|
|
|
fada68 |
From f5042bf76d048cb1fb77f9a60253cbf5a0ee9fc1 Mon Sep 17 00:00:00 2001
|
|
|
fada68 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
fada68 |
Date: Mon, 20 Jun 2016 21:09:00 +0200
|
|
|
fada68 |
Subject: [PATCH 4/5] Build: cib/Makefile.am: avoid second-guessing Libtool
|
|
|
fada68 |
|
|
|
fada68 |
Explicitly referring to location that is an implementation detail of
|
|
|
fada68 |
Libtool is not very reasonable and appears to be working regardless.
|
|
|
fada68 |
---
|
|
|
fada68 |
lib/cib/Makefile.am | 2 +-
|
|
|
fada68 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/lib/cib/Makefile.am b/lib/cib/Makefile.am
|
|
|
fada68 |
index 07bf261..0c57eee 100644
|
|
|
fada68 |
--- a/lib/cib/Makefile.am
|
|
|
fada68 |
+++ b/lib/cib/Makefile.am
|
|
|
fada68 |
@@ -24,7 +24,7 @@ lib_LTLIBRARIES = libcib.la
|
|
|
fada68 |
libcib_la_SOURCES = cib_ops.c cib_utils.c cib_client.c cib_native.c cib_attrs.c
|
|
|
fada68 |
libcib_la_SOURCES += cib_file.c cib_remote.c
|
|
|
fada68 |
|
|
|
fada68 |
-libcib_la_LDFLAGS = -version-info 5:1:1 -L$(top_builddir)/lib/pengine/.libs
|
|
|
fada68 |
+libcib_la_LDFLAGS = -version-info 5:1:1
|
|
|
fada68 |
libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
|
|
|
fada68 |
libcib_la_CFLAGS = -I$(top_srcdir)
|
|
|
fada68 |
|
|
|
fada68 |
--
|
|
|
fada68 |
1.8.3.1
|
|
|
fada68 |
|
|
|
fada68 |
|
|
|
fada68 |
From 8a86b03d1dbb8bab4a38f39544c519a2e7e85136 Mon Sep 17 00:00:00 2001
|
|
|
fada68 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
fada68 |
Date: Fri, 10 Jun 2016 17:55:57 +0200
|
|
|
fada68 |
Subject: [PATCH 5/5] Build: Makefile.am f.: move/drop comments to reflect
|
|
|
fada68 |
previous commits
|
|
|
fada68 |
|
|
|
fada68 |
* "# lex/yacc issues":
|
|
|
fada68 |
- introduced with 800b0c3 ("CFLAGS = $(CFLAGS_COPY:-Werror=)")
|
|
|
fada68 |
- comment + the statement got separated as of ae6fb13
|
|
|
fada68 |
|
|
|
fada68 |
* "# utils.h pengine.h"
|
|
|
fada68 |
- introduced with a4d9634
|
|
|
fada68 |
- became superfluous as of ef1f2e2
|
|
|
fada68 |
---
|
|
|
fada68 |
fencing/Makefile.am | 4 +---
|
|
|
fada68 |
pengine/Makefile.am | 2 +-
|
|
|
fada68 |
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
fada68 |
|
|
|
fada68 |
diff --git a/fencing/Makefile.am b/fencing/Makefile.am
|
|
|
fada68 |
index bef6e6e..79fe2ed 100644
|
|
|
fada68 |
--- a/fencing/Makefile.am
|
|
|
fada68 |
+++ b/fencing/Makefile.am
|
|
|
fada68 |
@@ -56,9 +56,6 @@ BUILT_SOURCES = standalone_config.h
|
|
|
fada68 |
|
|
|
fada68 |
stonithd_SOURCES += standalone_config.c config.y config.l
|
|
|
fada68 |
stonithd_AM_LFLAGS = -o$(LEX_OUTPUT_ROOT).c
|
|
|
fada68 |
-
|
|
|
fada68 |
-# lex/yacc issues:
|
|
|
fada68 |
-
|
|
|
fada68 |
endif
|
|
|
fada68 |
stonithd_YFLAGS = -d
|
|
|
fada68 |
|
|
|
fada68 |
@@ -69,6 +66,7 @@ stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
|
|
|
fada68 |
$(top_builddir)/pengine/libpengine.la \
|
|
|
fada68 |
$(CRYPTOLIB) $(CLUSTERLIBS)
|
|
|
fada68 |
|
|
|
fada68 |
+# lex/yacc issues:
|
|
|
fada68 |
CFLAGS = $(CFLAGS_COPY:-Werror=)
|
|
|
fada68 |
|
|
|
fada68 |
CLEANFILES = $(man7_MANS) $(man8_MANS)
|
|
|
fada68 |
diff --git a/pengine/Makefile.am b/pengine/Makefile.am
|
|
|
fada68 |
index 172a86b..170b728 100644
|
|
|
fada68 |
--- a/pengine/Makefile.am
|
|
|
fada68 |
+++ b/pengine/Makefile.am
|
|
|
fada68 |
@@ -58,8 +58,8 @@ man7_MANS = pengine.7
|
|
|
fada68 |
endif
|
|
|
fada68 |
|
|
|
fada68 |
## SOURCES
|
|
|
fada68 |
+
|
|
|
fada68 |
noinst_HEADERS = allocate.h utils.h pengine.h
|
|
|
fada68 |
-#utils.h pengine.h
|
|
|
fada68 |
|
|
|
fada68 |
libpengine_la_LDFLAGS = -version-info 11:0:1
|
|
|
fada68 |
# -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
|
|
|
fada68 |
--
|
|
|
fada68 |
1.8.3.1
|
|
|
fada68 |
|