Hi
This just brings openais's makefiles into sync with corosync's.
See Attached patch.
Regards
Angus
Index: test/Makefile
===================================================================
--- test/Makefile (revision 1634)
+++ test/Makefile (working copy)
@@ -31,8 +31,11 @@
# Include configuration
#
-include ../Makefile.inc
+srcdir ?= $(CURDIR)/../
+subdir ?= test/
+include $(srcdir)Makefile.inc
+
ifeq (${OPENAIS_COMPAT}, SOLARIS)
override LDFLAGS += -lnsl -lsocket -lrt
endif
Index: services/Makefile
===================================================================
--- services/Makefile (revision 1634)
+++ services/Makefile (working copy)
@@ -33,10 +33,10 @@
# Include configuration
#
srcdir ?= $(CURDIR)/../
+subdir ?= services/
include $(srcdir)Makefile.inc
-override CFLAGS += -I$(srcdir)include
LDFLAGS += -L./
ifeq (${OPENAIS_COMPAT}, LINUX)
Index: Makefile.inc
===================================================================
--- Makefile.inc (revision 1634)
+++ Makefile.inc (working copy)
@@ -115,3 +115,4 @@
endif
VPATH:=. $(srcdir) $(srcdir)$(subdir)
+override CFLAGS += -I$(srcdir)include -I$(srcdir)$(subdir)
Index: lib/Makefile
===================================================================
--- lib/Makefile (revision 1634)
+++ lib/Makefile (working copy)
@@ -32,10 +32,10 @@
# Include configuration
#
srcdir ?= $(CURDIR)/../
+subdir ?= lib/
include $(srcdir)Makefile.inc
-override CFLAGS += -I$(srcdir)include
override LDFLAGS += -L./
all: libSaClm.a libSaClm.so.2.0.0 \
@@ -69,19 +69,19 @@
else
libSaClm.so.2.0.0: util.o clm.o
- $(CC) $(LDFLAGS) -shared
-Wl,-soname,libclm.so.2,-version-script=libSaClm.versions util.o clm.o -o $@
+ $(CC) $(LDFLAGS) -shared
-Wl,-soname,libclm.so.2,-version-script=$(srcdir)$(subdir)libSaClm.versions
util.o clm.o -o $@
libSaCkpt.so.2.0.0: util.o ckpt.o
- $(CC) $(LDFLAGS) -shared
-Wl,-soname,libSaCkpt.so.2,-version-script=libSaCkpt.versions util.o ckpt.o -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=libSaEvt.versions util.o evt.o -o $@
+ $(CC) $(LDFLAGS) -shared
-Wl,-soname,libSaEvt.so.2,-version-script=$(srcdir)$(subdir)libSaEvt.versions
util.o evt.o -o $@
libSaMsg.so.2.0.0: util.o msg.o
- $(CC) $(LDFLAGS) -shared
-Wl,-soname,libmsg.so.2,-version-script=libSaMsg.versions util.o msg.o -o $@
+ $(CC) $(LDFLAGS) -shared
-Wl,-soname,libmsg.so.2,-version-script=$(srcdir)$(subdir)libSaMsg.versions
util.o msg.o -o $@
libSaLck.so.2.0.0: util.o lck.o
- $(CC) $(LDFLAGS) -shared
-Wl,-soname,libSaLck.so.2,-version-script=libSaLck.versions util.o lck.o -o $@
+ $(CC) $(LDFLAGS) -shared
-Wl,-soname,libSaLck.so.2,-version-script=$(srcdir)$(subdir)libSaLck.versions
util.o lck.o -o $@
endif
Index: Makefile
===================================================================
--- Makefile (revision 1634)
+++ Makefile (working copy)
@@ -29,29 +29,16 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
# THE POSSIBILITY OF SUCH DAMAGE.
-builddir:=$(CURDIR)/
+builddir:=$(shell pwd)/
ifneq ($(O),)
# cleanup the path (make it absolute)
-builddir:=$(abspath $(O))/
-ifeq ($(builddir),)
-builddir:=$(O)
-$(warning your abspath function is not working)
-$(warning > setting builddir to $(builddir))
+$(shell mkdir -p $(O))
+builddir:=$(shell cd $(O) && pwd)/
endif
-endif
+srcdir:=$(shell cd $(dir $(MAKEFILE_LIST)) && pwd)/
-THIS_MAKEFILE:=$(realpath $(lastword $(MAKEFILE_LIST)))
+include $(srcdir)/Makefile.inc
-ifeq ($(THIS_MAKEFILE),)
-srcdir:=$(CURDIR)/
-$(warning your realpath function is not working)
-$(warning > setting srcdir to $(srcdir))
-else
-srcdir:=$(dir $(THIS_MAKEFILE))
-endif
-
-include $(srcdir)Makefile.inc
-
INCLUDEDIR=$(PREFIX)/include/openais
MANDIR=$(PREFIX)/share/man
ETCDIR=/etc
@@ -72,7 +59,7 @@
LIBDIR=$(PREFIX)/lib/openais
endif
-SUBDIRS:=$(builddir)lcr $(builddir)lib $(builddir)test
+SUBDIRS:=$(builddir)lib $(builddir)test $(builddir)services
sub_make = srcdir=$(srcdir) builddir=$(builddir) subdir=$(1)/ $(MAKE)
-I$(srcdir)$(1) -f $(srcdir)$(1)/Makefile $(2)
all: $(SUBDIRS)
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
