From cadfe03dd65d8f4048a51c52e72875bacf85d27c Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
Date: Wed, 18 Mar 2009 07:52:48 +0000
Subject: [PATCH] Fix more soname= at linking

Start fixing distcheck

White space cleanups


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1862 fd59a12c-fef9-0310-b244-a6a79926bd2f
---
 exec/Makefile.am     | 58 ++++++++++++++++++++++++--------------------
 include/Makefile.am  |  2 +-
 lib/Makefile.am      |  5 ++++
 services/Makefile.am |  4 +--
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/exec/Makefile.am b/exec/Makefile.am
index 74190a36..a367b9ed 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -29,40 +29,47 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-MAINTAINERCLEANFILES    = Makefile.in
+MAINTAINERCLEANFILES	= Makefile.in
 
-AM_CFLAGS	= -fPIC
-AM_CPPFLAGS	= -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" \
-		  -DLCRSODIR=\"${LCRSODIR}\" -DSOCKETDIR=\"${SOCKETDIR}\"
+AM_CFLAGS		= -fPIC
+AM_CPPFLAGS		= -DSYSCONFDIR=\"${sysconfdir}\" \
+			  -DLOCALSTATEDIR=\"${localstatedir}\" \
+			  -DLCRSODIR=\"${LCRSODIR}\" \
+			  -DSOCKETDIR=\"${SOCKETDIR}\"
 
-INCLUDES	= -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
-LCR_SRC		= objdb.c vsf_ykd.c coroparse.c quorum.c vsf_quorum.c
-TOTEM_SRC	= coropoll.c totemip.c totemnet.c totemrrp.c totemsrp.c totemmrp.c totempg.c crypto.c wthread.c
-LOGSYS_SRC	= wthread.c logsys.c
+TOTEM_SRC		= coropoll.c totemip.c totemnet.c totemrrp.c \
+			  totemsrp.c totemmrp.c totempg.c crypto.c wthread.c
+LOGSYS_SRC		= wthread.c logsys.c
 
-LCRSO		= $(LCR_SRC:%.c=%.lcrso)
+LCRSO_SRC		= objdb.c vsf_ykd.c coroparse.c quorum.c vsf_quorum.c
+LCRSO_OBJS		= $(LCRSO_SRC:%.c=%.o)
+LCRSO			= $(LCRSO_SRC:%.c=%.lcrso)
 
-lib_LIBRARIES	= libtotem_pg.a liblogsys.a
-sbin_PROGRAMS	= corosync
-SHARED_LIBS	=
+lib_LIBRARIES		= libtotem_pg.a liblogsys.a
+sbin_PROGRAMS		= corosync
 
 libtotem_pg_a_SOURCES	= $(TOTEM_SRC)
 liblogsys_a_SOURCES	= $(LOGSYS_SRC)
 
-corosync_SOURCES = main.c mempool.c util.c sync.c apidef.c service.c ipc.c \
-		timer.c totemconfig.c mainconfig.c quorum.c ../lcr/lcr_ifact.c
-corosync_LDADD	  = -ltotem_pg -llogsys
-corosync_DEPENDENCIES = libtotem_pg.so.$(SONAME) liblogsys.so.$(SONAME)
-corosync_LDFLAGS = $(OS_DYFLAGS) -L./
+corosync_SOURCES 	= main.c mempool.c util.c sync.c apidef.c service.c ipc.c \
+			  timer.c totemconfig.c mainconfig.c quorum.c ../lcr/lcr_ifact.c
+corosync_LDADD	  	= -ltotem_pg -llogsys
+corosync_DEPENDENCIES	= libtotem_pg.so.$(SONAME) liblogsys.so.$(SONAME)
+corosync_LDFLAGS	= $(OS_DYFLAGS) -L./
 
-TOTEM_OBJS	= $(TOTEM_SRC:%.c=%.o)
-LOGSYS_OBJS	= $(LOGSYS_SRC:%.c=%.o)
-LCRSO_OBJS	= $(LCR_SRC:%.c=%.o)
+TOTEM_OBJS		= $(TOTEM_SRC:%.c=%.o)
+LOGSYS_OBJS		= $(LOGSYS_SRC:%.c=%.o)
 
-SHARED_LIBS	+= $(lib_LIBRARIES:%.a=%.so.$(SONAME))
-SHARED_LIBS_SO	= $(SHARED_LIBS:%.so.$(SONAME)=%.so)
-SHARED_LIBS_SO_TWO = $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
+SHARED_LIBS		= $(lib_LIBRARIES:%.a=%.so.$(SONAME))
+SHARED_LIBS_SO		= $(SHARED_LIBS:%.so.$(SONAME)=%.so)
+SHARED_LIBS_SO_TWO	= $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
+
+noinst_HEADERS		= apidef.h crypto.h ipc.h mainconfig.h main.h mempool.h \
+			  quorum.h service.h sync.h timer.h tlist.h totemconfig.h \
+			  totemmrp.h totemnet.h totemrrp.h totemsrp.h util.h \
+			  version.h vsf.h wthread.h
 
 if BUILD_DARWIN
 %.lcrso: %.o
@@ -77,7 +84,7 @@ liblogsys.so.$(SONAME): $(LOGSYS_OBJS)
 else
 
 %.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
+	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	$(CC) -shared -o $@ \
@@ -92,6 +99,7 @@ liblogsys.so.$(SONAME): $(LOGSYS_OBJS)
 		$^ $(LDFLAGS) -lpthread
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so.$(SOMAJOR)
+
 endif
 
 lint:
@@ -109,5 +117,3 @@ install-exec-local:
 
 clean-local:
 	rm -f corosync *.o *.lcrso gmon.out *.da *.bb *.bbg *.so*
-
-
diff --git a/include/Makefile.am b/include/Makefile.am
index 6557912c..c26b3fbd 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -35,7 +35,7 @@ CS_H			= hdb.h cs_config.h cpg.h cfg.h evs.h ipc_gen.h mar_gen.h swab.h 	\
 		  	coroipc.h confdb.h list.h corotypes.h quorum.h votequorum.h
 
 CS_INTERNAL_H		= ipc_cfg.h ipc_confdb.h ipc_cpg.h ipc_evs.h ipc_pload.h ipc_quorum.h 	\
-			jhash.h mar_cpg.h pload.h queue.h quorum.h rmd.h sq.h
+			jhash.h mar_cpg.h pload.h queue.h quorum.h rmd.h sq.h ipc_votequorum.h
 
 LCR_H			= lcr_ckpt.h lcr_comp.h	lcr_ifact.h
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6a99ef79..f7f22ba6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -53,6 +53,11 @@ libvotequorum_a_SOURCES	= coroipc.c votequorum.c
 libconfdb_a_SOURCES	= coroipc.c confdb.c sa-confdb.c
 libcoroipc_a_SOURCES	= coroipc.c
 
+noinst_HEADERS		= sa-confdb.h util.h \
+			  libcfg.versions libconfdb.versions \
+			  libcoroipc.versions libcpg.versions \
+			  libevs.versions libpload.versions \
+			  libquorum.versions libvotequorum.versions
 
 if BUILD_DARWIN
 
diff --git a/services/Makefile.am b/services/Makefile.am
index c55e9be3..1afee314 100644
--- a/services/Makefile.am
+++ b/services/Makefile.am
@@ -50,10 +50,10 @@ service_%.lcrso: %.o
 	$(CC) $(CFLAGS) -bundle -bundle_loader ../exec/corosync $^ -o $@
 else
 quorum_%.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
+	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 
 service_%.lcrso: %.o
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
+	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
 endif
 
 %.o: %.c