build: Remove totempg shared library leftovers

Because totempg is not distributed it doesn't make sense to distribute
totem header files. Also pkgconfig file should not be created any more.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>

diff --git a/corosync.spec.in b/corosync.spec.in
index 1062a43b33247908b1ca9059bfe008a5fdc79dc5..7e15d6d6af52f2e2c5c0f52ca4c6bd4454eb58d1 100644 (file)
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -247,11 +247,6 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/sam.h
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
-%dir %{_includedir}/corosync/totem/
-%{_includedir}/corosync/totem/totem.h
-%{_includedir}/corosync/totem/totemip.h
-%{_includedir}/corosync/totem/totempg.h
-%{_includedir}/corosync/totem/totemstats.h
 %{_libdir}/libcfg.so
 %{_libdir}/libcpg.so
 %{_libdir}/libcmap.so

diff --git a/include/Makefile.am b/include/Makefile.am
index d53a792bf02b6ad081340af1949731bb4443cb79..4b6697e88a509a17bb3a471eefc59e531dab8806 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -42,6 +42,6 @@ TOTEM_H                       = totem.h totemip.h totempg.h totemstats.h
 
 EXTRA_DIST             = $(noinst_HEADERS)
 
-noinst_HEADERS          = $(CS_INTERNAL_H:%=corosync/%)
+noinst_HEADERS          = $(CS_INTERNAL_H:%=corosync/%)  $(TOTEM_H:%=corosync/totem/%)
 
-nobase_include_HEADERS = $(CS_H:%=corosync/%) $(TOTEM_H:%=corosync/totem/%)
+nobase_include_HEADERS = $(CS_H:%=corosync/%)

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index db73df3c9a41a26df245380bf4728d71710876dd..c627355d5b967c17e00d471c5b2421fa9968e9a9 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -33,7 +33,7 @@ MAINTAINERCLEANFILES  = Makefile.in
 EXTRA_DIST             = libtemplate.pc.in corosync.pc.in
 
 LIBS   = cfg cpg quorum \
-         totem_pg votequorum sam cmap corosync_common
+         votequorum sam cmap corosync_common
 
 pkgconfigdir = $(libdir)/pkgconfig