Build: various: drop libpe_rules linkage

The library is now fully deprecated and all actually used code is in libcrmcommon.
ClusterLabs · Dec 16, 2024 · 9843641 · 9843641
1 parent 97e6044
commit 9843641
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/daemons/attrd/Makefile.am b/daemons/attrd/Makefile.am
@@ -20,7 +20,6 @@ pacemaker_attrd_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 pacemaker_attrd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la
 pacemaker_attrd_LDADD += $(top_builddir)/lib/cib/libcib.la
-pacemaker_attrd_LDADD += $(top_builddir)/lib/pengine/libpe_rules.la
 pacemaker_attrd_LDADD += $(top_builddir)/lib/lrmd/liblrmd.la
 pacemaker_attrd_LDADD += $(top_builddir)/lib/common/libcrmcommon.la
 pacemaker_attrd_LDADD += $(CLUSTERLIBS)

diff --git a/daemons/controld/Makefile.am b/daemons/controld/Makefile.am
@@ -21,7 +21,6 @@ pacemaker_controld_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 pacemaker_controld_LDADD = $(top_builddir)/lib/pacemaker/libpacemaker.la
 pacemaker_controld_LDADD += $(top_builddir)/lib/cib/libcib.la
-pacemaker_controld_LDADD += $(top_builddir)/lib/pengine/libpe_rules.la
 pacemaker_controld_LDADD += $(top_builddir)/lib/fencing/libstonithd.la
 pacemaker_controld_LDADD += $(top_builddir)/lib/cluster/libcrmcluster.la
 pacemaker_controld_LDADD += $(top_builddir)/lib/lrmd/liblrmd.la

diff --git a/lib/pacemaker-pe_rules.pc.in b/lib/pacemaker-pe_rules.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@/@PACKAGE_TARNAME@
 Name:             lib${sub}
 URL:              @PACKAGE_URL@
 Version:          @PACKAGE_VERSION@
-Description:      Scheduler rule APIs for Pacemaker
+Description:      Deprecated scheduler rule APIs for Pacemaker
 # pe_rules isn't very useful without glib hash table API
 Requires:         pacemaker glib-2.0
 Requires.private: libxml-2.0

diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -117,7 +117,6 @@ crm_resource_SOURCES	= crm_resource.c		\
 crm_resource_LDADD = $(top_builddir)/lib/pacemaker/libpacemaker.la
 crm_resource_LDADD += $(top_builddir)/lib/pengine/libpe_status.la
 crm_resource_LDADD += $(top_builddir)/lib/cib/libcib.la
-crm_resource_LDADD += $(top_builddir)/lib/pengine/libpe_rules.la
 crm_resource_LDADD += $(top_builddir)/lib/lrmd/liblrmd.la
 crm_resource_LDADD += $(top_builddir)/lib/fencing/libstonithd.la
 crm_resource_LDADD += $(top_builddir)/lib/services/libcrmservice.la
@@ -127,7 +126,6 @@ crm_rule_SOURCES 	= crm_rule.c
 crm_rule_LDADD = $(top_builddir)/lib/pacemaker/libpacemaker.la
 crm_rule_LDADD += $(top_builddir)/lib/pengine/libpe_status.la
 crm_rule_LDADD += $(top_builddir)/lib/cib/libcib.la
-crm_rule_LDADD += $(top_builddir)/lib/pengine/libpe_rules.la
 crm_rule_LDADD += $(top_builddir)/lib/common/libcrmcommon.la
 
 iso8601_SOURCES		= iso8601.c
@@ -140,7 +138,6 @@ attrd_updater_LDADD += $(top_builddir)/lib/common/libcrmcommon.la
 crm_ticket_SOURCES	= crm_ticket.c
 crm_ticket_LDADD = $(top_builddir)/lib/pacemaker/libpacemaker.la
 crm_ticket_LDADD += $(top_builddir)/lib/pengine/libpe_status.la
-crm_ticket_LDADD += $(top_builddir)/lib/pengine/libpe_rules.la
 crm_ticket_LDADD += $(top_builddir)/lib/cib/libcib.la
 crm_ticket_LDADD += $(top_builddir)/lib/common/libcrmcommon.la