This patch removes the static libraries from the linking and links with
the shared libcoroipc.so.2 to comply with various distributions
requirements not to have .a files in /usr/lib* directories.
Regards
-steve
Index: test/Makefile
===================================================================
--- test/Makefile (revision 1721)
+++ test/Makefile (working copy)
@@ -40,7 +40,7 @@
override LDFLAGS += -lnsl -lsocket -lrt
endif
-LIBRARIES= ../lib/libSaCkpt.a ../lib/libSaLck.a ../lib/libSaMsg.a ../lib/libSaEvt.a ../lib/libSaTmr.a ../lib/libSaClm.a sa_error.o
+LIBRARIES= -lSaCkpt -lSaLck -lSaMsg -lSaEvt -lSaTmr -lSaClm sa_error.o
LIBS = $(LIBRARIES)
BINARIES= testckpt testlck testlck2 testmsg testmsg2 testmsg3 testevt testtmr testclm
@@ -52,31 +52,31 @@
all: $(BINARIES)
-testckpt: testckpt.o $(LIBRARIES)
+testckpt: testckpt.o sa_error.o
$(CC) $(LDFLAGS) -o testckpt testckpt.o $(LIBS)
-testlck: testlck.o $(LIBRARIES)
+testlck: testlck.o sa_error.o
$(CC) $(LDFLAGS) -o testlck testlck.o $(LIBS)
-testlck2: testlck2.o $(LIBRARIES)
+testlck2: testlck2.o sa_error.o
$(CC) $(LDFLAGS) -o testlck2 testlck2.o $(LIBS)
-testmsg: testmsg.o $(LIBRARIES)
+testmsg: testmsg.o sa_error.o
$(CC) $(LDFLAGS) -o testmsg testmsg.o $(LIBS)
-testmsg2: testmsg2.o $(LIBRARIES)
+testmsg2: testmsg2.o sa_error.o
$(CC) $(LDFLAGS) -o testmsg2 testmsg2.o $(LIBS)
-testmsg3: testmsg3.o $(LIBRARIES)
+testmsg3: testmsg3.o sa_error.o
$(CC) $(LDFLAGS) -o testmsg3 testmsg3.o $(LIBS)
-testevt: testevt.o $(LIBRARIES)
+testevt: testevt.o sa_error.o
$(CC) $(LDFLAGS) -o testevt testevt.o $(LIBS)
-testclm: testclm.o $(LIBRARIES)
+testclm: testclm.o sa_error.o
$(CC) $(LDFLAGS) -o testclm testclm.o $(LIBS)
-testtmr: testtmr.o $(LIBRARIES)
+testtmr: testtmr.o sa_error.o
$(CC) $(LDFLAGS) -o testtmr testtmr.o $(LIBS)
clean:
Index: lib/Makefile
===================================================================
--- lib/Makefile (revision 1721)
+++ lib/Makefile (working copy)
@@ -36,15 +36,15 @@
include $(srcdir)Makefile.inc
-override LDFLAGS += -L./
+override LDFLAGS += -L./ -L$(COROSYNCLIBDIR)
-all: libSaClm.a libSaClm.so.2.0.0 \
- libSaCkpt.a libSaCkpt.so.2.0.0 \
- libSaAmf.a libSaAmf.so.2.0.0 \
- libSaEvt.a libSaEvt.so.2.0.0 \
- libSaMsg.a libSaMsg.so.2.0.0 \
- libSaLck.a libSaLck.so.2.0.0 \
- libSaTmr.a libSaTmr.so.2.0.0
+all: libSaClm.so.2.0.0 \
+ libSaCkpt.so.2.0.0 \
+ libSaAmf.so.2.0.0 \
+ libSaEvt.so.2.0.0 \
+ libSaMsg.so.2.0.0 \
+ libSaLck.so.2.0.0 \
+ libSaTmr.so.2.0.0
ifeq (${OPENAIS_COMPAT}, DARWIN)
@@ -52,80 +52,80 @@
libSaAmf.so.2.0.0: util.o amf.o
$(CC) $(DARWIN_OPTS) amf.o -o $@
+ ln -sf libSaAmf.so.2.0.0 libSaAmf.so.2
+ ln -sf libSaAmf.so.2.0.0 libSaAmf.so
libSaClm.so.2.0.0: util.o clm.o
- $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o clm.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o clm.o -lcoroipc -o $@
+ ln -sf libSaClm.so.2.0.0 libSaClm.so.2
+ ln -sf libSaClm.so.2.0.0 libSaClm.so
libSaCkpt.so.2.0.0: util.o ckpt.o
- $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o ckpt.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o ckpt.o -lcoroipc -o $@
+ ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so.2
+ ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so
libSaEvt.so.2.0.0: util.o evt.o
- $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evt.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evt.o -lcoroipc -o $@
+ ln -sf libSaEvt.so.2.0.0 libSaEvt.so.2
+ ln -sf libSaEvt.so.2.0.0 libSaEvt.so
libSaMsg.so.2.0.0: util.o msg.o
- $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o msg.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o msg.o -lcoroipc -o $@
+ ln -sf libSaMsg.so.2.0.0 libSaMsg.so.2
+ ln -sf libSaMsg.so.2.0.0 libSaMsg.so
libSaLck.so.2.0.0: util.o lck.o
- $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o lck.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o lck.o -lcoroipc -o $@
+ ln -sf libSaLck.so.2.0.0 libSaLck.so.2
+ ln -sf libSaLck.so.2.0.0 libSaLck.so
libSaTmr.so.2.0.0: util.o tmr.o
- $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o tmr.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o tmr.o -lcoroipc -o $@
+ ln -sf libSaTmr.so.2.0.0 libSaTmr.so.2
+ ln -sf libSaTmr.so.2.0.0 libSaTmr.so
else
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 $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaAmf.so.2,-version-script=$(srcdir)$(subdir)libSaAmf.versions util.o amf.o -lcoroipc -o $@
+ ln -sf libSaAmf.so.2.0.0 libSaAmf.so.2
+ ln -sf libSaAmf.so.2.0.0 libSaAmf.so
libSaClm.so.2.0.0: util.o clm.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.2,-version-script=$(srcdir)$(subdir)libSaClm.versions clm.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.2,-version-script=$(srcdir)$(subdir)libSaClm.versions clm.o util.o -lcoroipc -o $@
+ ln -sf libSaClm.so.2.0.0 libSaClm.so.2
+ ln -sf libSaClm.so.2.0.0 libSaClm.so
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 $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaCkpt.so.2,-version-script=$(srcdir)$(subdir)libSaCkpt.versions util.o ckpt.o -lcoroipc -o $@
+ ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so.2
+ ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so
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 $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaEvt.so.2,-version-script=$(srcdir)$(subdir)libSaEvt.versions util.o evt.o -lcoroipc -o $@
+ ln -sf libSaEvt.so.2.0.0 libSaEvt.so.2
+ ln -sf libSaEvt.so.2.0.0 libSaEvt.so
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 /usr/lib/corosync/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaMsg.so.2,-version-script=$(srcdir)$(subdir)libSaMsg.versions util.o msg.o -lcoroipc -o $@
+ ln -sf libSaMsg.so.2.0.0 libSaMsg.so.2
+ ln -sf libSaMsg.so.2.0.0 libSaMsg.so
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 $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaLck.so.2,-version-script=$(srcdir)$(subdir)libSaLck.versions util.o lck.o -lcoroipc -o $@
+ ln -sf libSaLck.so.2.0.0 libSaLck.so.2
+ ln -sf libSaLck.so.2.0.0 libSaLck.so
libSaTmr.so.2.0.0: util.o tmr.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaTmr.so.2,-version-script=$(srcdir)$(subdir)libSaTmr.versions util.o tmr.o $(COROSYNCLIBDIR)/libcoroipc.a -o $@
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaTmr.so.2,-version-script=$(srcdir)$(subdir)libSaTmr.versions util.o tmr.o -lcoroipc -o $@
+ ln -sf libSaTmr.so.2.0.0 libSaTmr.so.2
+ ln -sf libSaTmr.so.2.0.0 libSaTmr.so
endif
-libSaAmf.a: util.o amf.o
- $(AR) x $(COROSYNCLIBDIR)/libcoroipc.a
- $(AR) -rc libSaAmf.a util.o amf.o coroipc.o
-
-libSaCkpt.a: util.o ckpt.o
- $(AR) x $(COROSYNCLIBDIR)/libcoroipc.a
- $(AR) -rc libSaCkpt.a util.o ckpt.o coroipc.o
-
-libSaClm.a: util.o clm.o
- $(AR) x $(COROSYNCLIBDIR)/libcoroipc.a
- $(AR) -rc libSaClm.a util.o clm.o coroipc.o
-
-libSaEvt.a: util.o evt.o
- $(AR) x $(COROSYNCLIBDIR)/libcoroipc.a
- $(AR) -rc libSaEvt.a util.o evt.o coroipc.o
-
-libSaMsg.a: util.o msg.o
- $(AR) x $(COROSYNCLIBDIR)/libcoroipc.a
- $(AR) -rc libSaMsg.a util.o msg.o coroipc.o
-
-libSaLck.a: util.o lck.o
- $(AR) x $(COROSYNCLIBDIR)/libcoroipc.a
- $(AR) -rc libSaLck.a util.o lck.o coroipc.o
-
-libSaTmr.a: util.o tmr.o
- $(AR) x $(COROSYNCLIBDIR)/libcoroipc.a
- $(AR) -rc libSaTmr.a util.o tmr.o coroipc.o
-
clean:
- rm -f *.o libSa*.so* libSa*.a *.da *.bb *.bbg
+ rm -f *.o libSa*.so* *.da *.bb *.bbg
# -fPIC rules required for all libraries
%.o: %.c
Index: Makefile
===================================================================
--- Makefile (revision 1721)
+++ Makefile (working copy)
@@ -110,22 +110,14 @@
for aLib in $(AIS_LIBS); do \
( cd $(builddir) ; \
- ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so; \
- ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so.2; \
$(CP) -a lib/lib$$aLib.so $(DESTDIR)$(LIBDIR); \
$(CP) -a lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR); \
install -m 755 lib/lib$$aLib.so.2.* $(DESTDIR)$(LIBDIR); \
- if [ "xYES" = "x$(STATICLIBS)" ]; then \
- install -m 755 lib/lib$$aLib.a $(DESTDIR)$(LIBDIR); \
- if [ ${OPENAIS_COMPAT} = "DARWIN" ]; then \
- ranlib $(DESTDIR)$(LIBDIR)/lib$$aLib.a; \
- fi \
- fi \
) \
done
echo $(LIBDIR) > "$(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais-$(ARCH).conf"
-
+ ldconfig -v
install -m 755 $(builddir)services/*lcrso $(DESTDIR)$(LCRSODIR)
install -m 755 $(builddir)services/openais-instantiate $(DESTDIR)$(SBINDIR)
install -m 755 $(builddir)services/aisexec $(DESTDIR)$(SBINDIR)
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
