Cause libraries to build.

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

corosync/lib/Makefile

@@ -30,61 +30,29 @@
 
 # Include configuration
 #
+srcdir ?= $(CURDIR)/../
+
 include $(srcdir)Makefile.inc
 
+
 override CFLAGS += -I$(srcdir)include
 override LDFLAGS += -L./
 
-all:libSaClm.a libSaClm.so.2.0.0 \
-	libSaAmf.a libSaAmf.so.2.0.0 \
-	libSaCkpt.a libSaCkpt.so.2.0.0 \
-	libSaEvt.a libSaEvt.so.2.0.0 \
-	libSaLck.a libSaLck.so.2.0.0 \
-	libSaMsg.a libSaMsg.so.2.0.0 \
-	libcpg.a libcpg.so.2.0.0 \
+all: libcpg.a libcpg.so.2.0.0 \
 	libconfdb.a libconfdb.so.2.0.0 \
-	libais.a libais.so.2.0.0 \
 	libevs.a libevs.so.2.0.0 \
 	libcfg.a libcfg.so.2.0.0 \
-	libaisutil.a libaisutil.so.2.0.0
-
-LIBAIS_SRC = util.c amf.c clm.c ckpt.c evt.c
-
-LIBEVS_SRC = util.c evs.c
+	libcoroutil.a libcoroutil.so.2.0.0
 
-libSaClm.a: util.o clm.o
-	$(AR) -rc libSaClm.a util.o clm.o
-
-libaisutil.a: util.o
-	$(AR) -rc libaisutil.a util.o
+libcoroutil.a: util.o
+	$(AR) -rc libcoroutil.a util.o
 
 ifeq (${OPENAIS_COMPAT}, DARWIN)
 
 DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 2.0.0 -compatibility_version 2.0.0
-libaisutil.so.2.0.0: util.o
+libcoroutil.so.2.0.0: util.o
 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o -o $@
 
-libSaClm.so.2.0.0: util.o clm.o
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o clm.o -o $@
-
-libSaAmf.so.2.0.0: util.o amf.o
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o amf.o -o $@
-
-libSaCkpt.so.2.0.0: util.o ckpt.o
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o ckpt.o -o $@
-
-libSaEvt.so.2.0.0: util.o evt.o
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evt.o -o $@
-
-libSaLck.so.2.0.0: util.o lck.o
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o lck.o -o $@
-
-libSaMsg.so.2.0.0: util.o msg.o
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o msg.o -o $@
-
-libais.so.2.0.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o amf.o clm.o ckpt.o evt.o -o $@
-
 libevs.so.2.0.0: util.o evs.o
 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evs.o -o $@
 
@@ -97,64 +65,28 @@ libconfdb.so.2.0.0: util.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o
 libcfg.so.2.0.0: util.o cfg.o
 	$(CC) $(DARWIN_OPTS) util.o cfg.o -o $@
 
-else
-
-libaisutil.so.2.0.0: util.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libaisutil.so.2,-version-script=$(srcdir)$(subdir)libaisutil.versions util.o -o $@
-
-libSaClm.so.2.0.0: util.o clm.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.2,-version-script=$(srcdir)$(subdir)libSaClm.versions util.o clm.o -o $@
-
-libSaAmf.so.2.0.0: util.o amf.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaAmf.so.2,-version-script=$(srcdir)$(subdir)libSaAmf.versions util.o amf.o -o $@
-
-libSaCkpt.so.2.0.0: util.o ckpt.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaCkpt.so.2,-version-script=$(srcdir)$(subdir)libSaCkpt.versions util.o ckpt.o -o $@
-
-libSaEvt.so.2.0.0: util.o evt.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaEvt.so.2,-version-script=$(srcdir)$(subdir)libSaEvt.versions util.o evt.o -o $@
-
-libSaLck.so.2.0.0: util.o lck.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaLck.so.2,-version-script=$(srcdir)$(subdir)libSaLck.versions util.o lck.o -o $@
+libcpg.so.2.0.0: util.o cpg.o
+	$(CC) $(DARWIN_OPTS) util.o cpg.o -o $@
 
-libSaMsg.so.2.0.0: util.o msg.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaMsg.so.2,-version-script=$(srcdir)$(subdir)libSaMsg.versions util.o msg.o -o $@
+else
 
-libais.so.2.0.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libais.so.2,-version-script=$(srcdir)$(subdir)libSaAis.versions util.o amf.o clm.o ckpt.o evt.o -o $@
+libcoroutil.so.2.0.0: util.o
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libcoroutil.so.2,-version-script=libcoroutil.versions util.o -o $@
 
 libevs.so.2.0.0: util.o evs.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.2,-version-script=$(srcdir)$(subdir)libevs.versions util.o evs.o -o $@
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.2,-version-script=libevs.versions util.o evs.o -o $@
 
 libcpg.so.2.0.0: util.o cpg.o
-	$(CC) -shared -Wl,-soname,libcpg.so.2,-version-script=$(srcdir)$(subdir)libcpg.versions util.o cpg.o -o $@
+	$(CC) -shared -Wl,-soname,libcpg.so.2,-version-script=libcpg.versions util.o cpg.o -o $@
 
 libconfdb.so.2.0.0: util.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,libconfdb.so.2,-version-script=$(srcdir)$(subdir)libconfdb.versions util.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libconfdb.so.2,-version-script=libconfdb.versions util.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@
 
 libcfg.so.2.0.0: util.o cfg.o
-	$(CC) -shared -Wl,-soname,libcfg.so.2,-version-script=$(srcdir)$(subdir)libcfg.versions util.o cfg.o -o $@
+	$(CC) -shared -Wl,-soname,libcfg.so.2,-version-script=libcfg.versions util.o cfg.o -o $@
 
 endif
 
-libSaAmf.a: util.o amf.o
-	$(AR) -rc libSaAmf.a util.o amf.o
-
-libSaCkpt.a: util.o ckpt.o
-	$(AR) -rc libSaCkpt.a util.o ckpt.o
-
-libSaEvt.a: util.o evt.o
-	$(AR) -rc libSaEvt.a util.o evt.o
-
-libSaLck.a: util.o lck.o
-	$(AR) -rc libSaLck.a util.o lck.o
-
-libSaMsg.a: util.o msg.o
-	$(AR) -rc libSaMsg.a util.o msg.o
-
-libais.a: util.o amf.o clm.o ckpt.o evt.o msg.o
-	$(AR) -rc libais.a util.o amf.o clm.o ckpt.o evt.o msg.o
-
 libevs.a: util.o evs.o
 	$(AR) -rc libevs.a util.o evs.o
 
@@ -168,11 +100,9 @@ libcfg.a: util.o cfg.o
 	$(AR) -rc libcfg.a util.o cfg.o
 
 clean:
-	rm -f *.o libais.so* libais.a libSaClm.so* libSaClm.a* libSaAmf.so* libSaAmf.a \
-		libSaCkpt.so* libSaCkpt.a* libSaEvt.so* libSaEvt.a libSaLck.so* libSaLck.a \
-		libSaMsg.so* libSaMsg.a libcfg.so* libOpenaisCfg.a libaisutil.so* libaisutil.a \
-		libevs.so* libevs.a libcpg.so* libcpg.a libcfg.a libconfdb.so* libconfdb.a libconfdb.a \
-		*.da *.bb *.bbg
+	rm -f *.o libcfg.so* ibcoroutil.so* libcoroutil.a \
+		libevs.so* libevs.a libcpg.so* libcpg.a libcfg.a libconfdb.so* \
+		libconfdb.a libconfdb.a \ *.da *.bb *.bbg
  
 # -fPIC rules required for all libraries
 %.o: %.c
@@ -180,21 +110,3 @@ clean:
 
 depend:
 	makedepend -Y -- $(CFLAGS) $(CPPFLAGS) $(LIBAIS_SRC) > /dev/null 2>&1
-# DO NOT DELETE
-
-util.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h ../include/ais_util.h
-amf.o: ../include/saAis.h ../include/saAmf.h ../include/saAis.h
-amf.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_amf.h
-amf.o: ../include/ipc_gen.h ../include/saAmf.h ../include/ais_util.h
-clm.o: ../include/saAis.h ../include/saClm.h ../include/saAis.h
-clm.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_clm.h
-clm.o: ../include/saClm.h ../include/ipc_gen.h ../include/ais_util.h
-ckpt.o: ../include/saAis.h ../include/list.h ../include/saCkpt.h
-ckpt.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_ckpt.h
-ckpt.o: ../include/saAis.h ../include/saCkpt.h ../include/ipc_gen.h ../include/ais_util.h
-evt.o: ../include/ipc_evt.h ../include/saAis.h ../include/saEvt.h
-evt.o: ../include/saClm.h ../include/ipc_gen.h ../include/ais_util.h ../include/ipc_gen.h
-evt.o: ../exec/totemip.h ../exec/totem.h ../exec/totemip.h ../include/list.h
-cpg.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h
-cpg.o: ../include/ipc_cpg.h ../include/saAis.h ../include/saClm.h
-cpg.o: ../include/ipc_gen.h ../include/ais_util.h

corosync/lib/libcoroutil.versions

@@ -0,0 +1,18 @@
+# Version and symbol export for libaisutil.so
+
+OPENAIS_UTIL_2.0 {
+	global:
+		saHandleCreate;
+		saHandleDestroy;
+		saHandleInstanceGet;
+		saHandleInstancePut;
+		saRecvRetry;
+		saSelectRetry;
+		saSendMsgReceiveReply;
+		saSendMsgRetry;
+		saSendReceiveReply;
+		saSendRetry;
+		saServiceConnect;
+		saVersionVerify;
+		clustTimeNow;
+};

corosync/lib/util.c

@@ -546,7 +546,7 @@ saHandleCreate (
 {
 	uint32_t handle;
 	uint32_t check;
-	void *newHandles;
+	void *newHandles = NULL;
 	int found = 0;
 	void *instance;
 	int i;