but keep all the other good stuff
Regards
-steve
Index: test/Makefile
===================================================================
--- test/Makefile (revision 1722)
+++ test/Makefile (working copy)
@@ -80,7 +80,7 @@
$(CC) $(LDFLAGS) -o testtmr testtmr.o $(LIBS)
clean:
- rm -f *.o $(LIBRARIES) $(BINARIES)
+ rm -f *.o $(BINARIES)
%.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
Index: lib/Makefile
===================================================================
--- lib/Makefile (revision 1722)
+++ lib/Makefile (working copy)
@@ -38,13 +38,13 @@
override LDFLAGS += -L./ -L$(COROSYNCLIBDIR)
-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
+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
ifeq (${OPENAIS_COMPAT}, DARWIN)
@@ -124,6 +124,27 @@
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
+
+libSaClm.a: util.o clm.o
+ $(AR) -rc libSaClm.a util.o clm.o
+
+libSaEvt.a: util.o evt.o
+ $(AR) -rc libSaEvt.a util.o evt.o
+
+libSaMsg.a: util.o msg.o
+ $(AR) -rc libSaMsg.a util.o msg.o
+
+libSaLck.a: util.o lck.o
+ $(AR) -rc libSaLck.a util.o lck.o
+
+libSaTmr.a: util.o tmr.o
+ $(AR) -rc libSaTmr.a util.o tmr.o
+
clean:
rm -f *.o libSa*.so* *.da *.bb *.bbg
Index: Makefile
===================================================================
--- Makefile (revision 1722)
+++ Makefile (working copy)
@@ -110,14 +110,22 @@
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
