- tidy up whitespaces

- try to keep everything < 80 cols

- stop installing testing lcrso

- fix soname= invokation



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1861 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/Makefile.am

@@ -34,7 +34,8 @@ MAINTAINERCLEANFILES    = Makefile.in
 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
@@ -79,12 +80,16 @@ else
 	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.$(SOMAJOR) $^ -o $@ -lpthread
+	$(CC) -shared -o $@ \
+		-Wl,-soname=libtotem_pg.so.$(SOMAJOR) \
+		$^ $(LDFLAGS) -lpthread
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so.$(SOMAJOR)
 
 liblogsys.so.$(SONAME): $(LOGSYS_OBJS)
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,liblogsys.so.$(SOMAJOR) $^ -o $@ -lpthread
+	$(CC) -shared -o $@ \
+		-Wl,-soname=liblogsys_pg.so.$(SOMAJOR) \
+		$^ $(LDFLAGS) -lpthread
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so
 	ln -sf liblogsys.so.$(SONAME) liblogsys.so.$(SOMAJOR)
 endif

lcr/Makefile.am

@@ -33,9 +33,8 @@ MAINTAINERCLEANFILES    = Makefile.in
 AM_CFLAGS		= -fPIC
 AM_CPPFLAGS		= -DLCRSODIR=\"${LCRSODIR}\" -DLOCALSTATEDIR=\"${localstatedir}\" \
 			  -DSOCKETDIR=\"${SOCKETDIR}\"
-INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
-LCRSO			= libtest_a.lcrso libtest_b.lcrso
+INCLUDES 		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
 lib_LIBRARIES		= liblcr.a
 
@@ -63,13 +62,9 @@ endif
 lint:
 	-splint $(LINT_FLAGS) $(CFLAGS) *.c
 
-all-local: $(LCRSO)
+all-local: $(noinst_LCRSO)
 	@echo Built Live Component Replacement System
 
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
-	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
-
 clean-local:
 	rm -f *.o *.a *.so* *.da *.bb *.bbg *.lcrso
 

lib/Makefile.am

@@ -33,10 +33,13 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
-AM_CPPFLAGS		= -DLOCALSTATEDIR=\"${localstatedir}\" -DSOCKETDIR=\"${SOCKETDIR}\"
-INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
+AM_CPPFLAGS		= -DLOCALSTATEDIR=\"${localstatedir}\" \
+			  -DSOCKETDIR=\"${SOCKETDIR}\"
 
-lib_LIBRARIES	= libcpg.a libconfdb.a libevs.a libcfg.a libquorum.a libvotequorum.a libpload.a libcoroipc.a
+INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
+
+lib_LIBRARIES		= libcpg.a libconfdb.a libevs.a libcfg.a libquorum.a \
+			  libvotequorum.a libpload.a libcoroipc.a
 SHARED_LIBS		= $(lib_LIBRARIES:%.a=%.so.$(SONAME))
 SHARED_LIBS_SO		= $(lib_LIBRARIES:%.a=%.so)
 SHARED_LIBS_SO_TWO	= $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
@@ -65,17 +68,26 @@ lib%.so.$(SONAME): coroipc.o %.o
 else
 
 libcoroipc.so.$(SONAME): coroipc.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libcoroipc.so.$(SOMAJOR),-version-script=$(srcdir)/libcoroipc.versions coroipc.o -o $@
+	$(CC) -shared -o $@ \
+		-Wl,-soname=libcoroipc.so.$(SOMAJOR) \
+		-Wl,-version-script=$(srcdir)/libcoroipc.versions \
+		$^ $(LDFLAGS) $(AM_LDFLAGS)
 	ln -sf libcoroipc.so.$(SONAME) libcoroipc.so
 	ln -sf libcoroipc.so.$(SONAME) libcoroipc.so.$(SOMAJOR)
 
-libconfdb.so.$(SONAME): coroipc.o confdb.o sa-confdb.o 
-	$(CC) $(LDFLAGS) $(OS_DYFLAGS) -shared -Wl,-soname,libconfdb.so.$(SOMAJOR),-version-script=$(srcdir)/libconfdb.versions coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@ -ldl
+libconfdb.so.$(SONAME): coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o
+	$(CC) -shared -o $@ \
+		-Wl,-soname=libconfdb.so.$(SOMAJOR) \
+		-Wl,-version-script=$(srcdir)/libconfdb.versions \
+		$^ $(LDFLAGS) $(OS_DYFLAGS) -ldl
 	ln -sf libconfdb.so.$(SONAME) libconfdb.so
 	ln -sf libconfdb.so.$(SONAME) libconfdb.so.$(SOMAJOR)
 
 lib%.so.$(SONAME): coroipc.o %.o
-	$(CC) -shared -Wl,-soname,lib$*.so.$(SOMAJOR),-version-script=$(srcdir)/lib$*.versions $^ -o $@
+	$(CC) -shared -o $@ \
+		-Wl,-soname=lib$*.so.$(SOMAJOR) \
+		-Wl,-version-script=$(srcdir)/lib$*.versions \
+		$^ $(LDFLAGS)
 	ln -sf lib$*.so.$(SONAME) lib$*.so
 	ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR)
 

services/Makefile.am

@@ -32,8 +32,13 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
-INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
-LCRSO			= service_evs.lcrso service_cfg.lcrso service_cpg.lcrso service_confdb.lcrso service_pload.lcrso quorum_votequorum.lcrso quorum_testquorum.lcrso
+
+INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
+
+LCRSO			= service_evs.lcrso service_cfg.lcrso \
+			  service_cpg.lcrso service_confdb.lcrso \
+			  service_pload.lcrso quorum_votequorum.lcrso \
+			  quorum_testquorum.lcrso
 
 LCRSO_OBJS = $(LCRSO:service_%.lcrso=%.o) $(LCRSO:quorum_%.lcrso=%.o)
 

test/Makefile.am

@@ -31,7 +31,7 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 MAINTAINERCLEANFILES    = Makefile.in
-INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
+INCLUDES       		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_PROGRAMS		= testevs evsbench evsverify testcpg testcpg2 cpgbench testconfdb	\
 			logsysbench logsysrec testquorum testvotequorum1 testvotequorum2