[Openais] [PATCH] really flexible compiling (compile from another directory - take 2)

angus salkeld angus.salkeld at alliedtelesis.co.nz
Mon Sep 24 14:23:43 PDT 2007


Hi

I don't mind it not getting into 0.82, just into trunk.  If you are
happy with it can you commit it please
there are other people submitting makefile patches, and it is just
going to make more work maintaining
this patch.

Thanks
-Angus

>>> On Mon, Sep 17, 2007 at  6:52 pm, in message
<1190011924.31519.10.camel at balance>, Steven Dake <sdake at redhat.com>
wrote: 
> Angus
> This patch will be merged tomorrow morning for trunk.  I apologize
for
> not getting it in 0.82 but I wanted a bit of bake time in the
community
> on it.
> 
> Regards
> - steve
> 
> On Mon, 2007- 09- 17 at 16:58 +1200, angus salkeld wrote:
>> Hi
>> 
>> Here is the patch tarr'ed up.
>> 
>> - Angus
>> 
>> >>> On Sun, Sep 9, 2007 at  6:13 pm, in message
>> <1189318409.3568.2.camel at balance>,
>> Steven Dake <sdake at redhat.com> wrote: 
>> > Angus,
>> > 
>> > I have been preparing a new release for openais 0.82 and ensuring
>> all
>> > patches are committed that have hit the list.
>> > 
>> > Unfortunately this patch was munged by your mailer and doesn't
apply
>> > cleanly which explains why it was never committed.
>> > 
>> > I intend to merge some of Andrew's patches related to external
>> service
>> > handlers.  Would you mind reworking this patch on top of Andrew's
>> > changes?  They should be live in the svn repository shortly.
>> > 
>> > Regards
>> > -  steve
>> > 
>> > On Thu, 2007-  07-  05 at 22:32 +1200, Angus Salkeld wrote:
>> >> Hi
>> >> 
>> >> This makes building really flexible.
>> >> 
>> >> You can now do any of the below:
>> >> 
>> >> 1]
>> >> openais > make
>> >> openais > make DESTDIR=/tmp/where_ever install
>> >> 
>> >> 2]
>> >> openais > mkdir /tmp/ais-  powerpc-  e500
>> >> openais > cd /tmp/ais-  powerpc-  e500
>> >> ais-  powerpc-  e500 > make -  f ~/projects/openais/Makefile
>> >> ais-  powerpc-  e500 > make -  f ~/projects/openais/Makefile
>> >> DESTDIR=/tmp/where_ever install
>> >> 
>> >> 
>> >> 3]
>> >> openais > make O=/tmp/ais-  powerpc-  e500
>> >> openais > make O=/tmp/ais-  powerpc-  e500
DESTDIR=/tmp/where_ever
>> install
>> >> 
>> >> 4]
>> >> openais > cd ~/any_were_you_like
>> >> ~/any_were_you_like > make -  f ~/projects/openais/Makefile 
>> > O=/tmp/ais-  powerpc-  e500
>> >> ~/any_were_you_like > make -  f ~/projects/openais/Makefile 
>> > O=/tmp/ais-  powerpc-  e500 DESTDIR=/tmp/where_ever install
>> >> 
>> >> 
>> >> As before:
>> >> It does rely on VPATH so I don't suggest mixing the two.
>> >> > i.e trying to compile from openais and then somewhere 
>> >>       else without a make clean.
>> >> 
>> >> 
>> >> -  Angus Salkeld
>> >> -------------------------------------------------------
>> >> 
>> >> diff -  Nur -  x '*.svn' -  x '*.git' ais-  clean/exec/Makefile
>> >> ais-  make/exec/Makefile
>> >> ---   ais-  clean/exec/Makefile	2007-  07-  04
14:31:04.000000000
>> +1200
>> >> +++ ais-  make/exec/Makefile	2007-  07-  04
22:06:56.000000000 +1200
>> >> @@ -  31,9 +31,9 @@
>> >>  
>> >>  # Include configuration
>> >>  #
>> >> -  include ../Makefile.inc
>> >> +include $(srcdir)Makefile.inc
>> >>  
>> >> -  override CFLAGS += -  I../include
>> >> +override CFLAGS += -  I$(srcdir)include
>> >>  LDFLAGS += -  L./
>> >>  
>> >>  ifeq (${BUILD_DYNAMIC}, 1) 
>> >> @@ -  198,71 +198,71 @@
>> >>  	$(CC) $(CFLAGS) $(CPPFLAGS) -  I../lcr -  c -  o $@
>> ../lcr/lcr_ifact.c
>> >>  
>> >>  evs.o: evs.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  clm.o: clm.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  amf.o: amf.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  ckpt.o: ckpt.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  evt.o: evt.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  lck.o: lck.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  msg.o: msg.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  cfg.o: cfg.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  aisparser.o: aisparser.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  vsf_ykd.o: vsf_ykd.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  cpg.o: cpg.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  c -  o $@ $<
>> >>  
>> >>  objdb.o: objdb.c
>> >> -	$(CC) $(CFLAGS) -  c -  o $@ $(*F).c
>> >> +	$(CC) $(CFLAGS) -  c -  o $@ $<
>> >>  
>> >>  # -  fPIC rules required for lib totem
>> >>  aispoll.o: aispoll.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  totempg.o: totempg.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  totemsrp.o: totemsrp.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  totemrrp.o: totemrrp.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  totemip.o: totemip.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  totemnet.o: totemnet.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  wthread.o: wthread.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  crypto.o: crypto.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  totemmrp.o: totemmrp.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  totemconfig.o: totemconfig.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  # DO NOT DELETE
>> >>  
>> >> diff -  Nur -  x '*.svn' -  x '*.git' ais-  clean/lcr/Makefile
>> >> ais-  make/lcr/Makefile
>> >> ---   ais-  clean/lcr/Makefile	2007-  07-  04
14:30:37.000000000
>> +1200
>> >> +++ ais-  make/lcr/Makefile	2007-  07-  04
21:41:25.000000000 +1200
>> >> @@ -  70,10 +70,10 @@
>> >>  	$(CC) $(LDFLAGS) uic.o -  o uic
>> >>  
>> >>  libtest_a.o: libtest_a.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  libtest_b.o: libtest_b.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  clean:
>> >>  	rm -  f test libtest.so* *.o uic liblcr.so* liblcr.a
*.lcrso *.da
>> *.ba
>> >> *.bb *.bbg \
>> >> diff -  Nur -  x '*.svn' -  x '*.git' ais-  clean/lib/Makefile
>> >> ais-  make/lib/Makefile
>> >> ---   ais-  clean/lib/Makefile	2007-  07-  04
14:31:16.000000000
>> +1200
>> >> +++ ais-  make/lib/Makefile	2007-  07-  04
22:07:45.000000000 +1200
>> >> @@ -  30,9 +30,9 @@
>> >>  
>> >>  # Include configuration
>> >>  #
>> >> -  include ../Makefile.inc
>> >> +include $(srcdir)Makefile.inc
>> >>  
>> >> -  CFLAGS += -  I../include
>> >> +CFLAGS += -  I$(srcdir)include
>> >>  LDFLAGS += -  L./
>> >>  
>> >>  all:libSaClm.a libSaClm.so.2.0.0 \
>> >> @@ -  88,34 +88,34 @@
>> >>  else
>> >>  
>> >>  libSaClm.so.2.0.0: util.o clm.o
>> >> -	$(CC) $(LDFLAGS) -  shared
>> >> -  Wl,-  soname,libSaClm.so.2,-  version- 
script=libSaClm.versions
>> util.o clm.o
>> >> -  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=libSaAmf.versions
>> util.o amf.o
>> >> -  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=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 $@
>> >>  
>> >>  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 $@
>> >>  
>> >>  libSaMsg.so.2.0.0: util.o msg.o
>> >> -	$(CC) $(LDFLAGS) -  shared
>> >> -  Wl,-  soname,libSaMsg.so.2,-  version- 
script=libSaMsg.versions
>> util.o msg.o
>> >> -  o $@
>> >> +	$(CC) $(LDFLAGS) -  shared -  Wl,- 
soname,libSaMsg.so.2,-  version-
>> script=
>> >> $(srcdir)$(subdir)libSaMsg.versions 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) -  shared
>> >> -  Wl,-  soname,libais.so.2,-  version-  script=libSaAis.versions
util.o
>> amf.o
>> >> clm.o ckpt.o evt.o -  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
>> >> $@
>> >>  
>> >>  libevs.so.2.0.0: util.o evs.o
>> >> -	$(CC) $(LDFLAGS) -  shared
>> >> -  Wl,-  soname,libevs.so.2,-  version-  script=libevs.versions
util.o
>> evs.o -  o
>> >> $@
>> >> +	$(CC) $(LDFLAGS) -  shared -  Wl,-  soname,libevs.so.2,-
 version-
>> script=
>> >> $(srcdir)$(subdir)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=libcpg.versions
>> >> util.o cpg.o -  o $@
>> >> +	$(CC) -  shared -  Wl,-  soname,libcpg.so.2,-  version- 
script=
>> >> $(srcdir)$(subdir)libcpg.versions util.o cpg.o -  o $@
>> >>  
>> >>  libcfg.so.2.0.0: util.o cfg.o
>> >> -	$(CC) -  shared -  Wl,-  soname,libcfg.so.2,-  version-
>> script=libcfg.versions
>> >> util.o cfg.o -  o $@
>> >> +	$(CC) -  shared -  Wl,-  soname,libcfg.so.2,-  version- 
script=
>> >> $(srcdir)$(subdir)libcfg.versions util.o cfg.o -  o $@
>> >>  
>> >>  endif
>> >>  
>> >> @@ -  154,7 +154,7 @@
>> >>   
>> >>  # -  fPIC rules required for all libraries
>> >>  %.o: %.c
>> >> -	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@
$(*F).c
>> >> +	$(CC) $(CFLAGS) $(CPPFLAGS) -  fPIC -  c -  o $@ $<
>> >>  
>> >>  depend:
>> >>  	makedepend -  Y --   $(CFLAGS) $(CPPFLAGS) $(LIBAIS_SRC)
>
>> /dev/null 2>&1
>> >> diff -  Nur -  x '*.svn' -  x '*.git' ais-  clean/Makefile ais-
>> make/Makefile
>> >> ---   ais-  clean/Makefile	2007-  07-  04
14:31:21.000000000 +1200
>> >> +++ ais-  make/Makefile	2007-  07-  05 21:59:16.000000000 +1200
>> >> @@ -  29,7 +29,15 @@
>> >>  # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
>> ADVISED
>> >> OF
>> >>  # THE POSSIBILITY OF SUCH DAMAGE.
>> >>  
>> >> -  include Makefile.inc
>> >> +
>> >> +builddir:=$(shell pwd)/
>> >> +ifneq ($(O),)
>> >> +# cleanup the path (make it absolute)
>> >> +builddir:=$(abspath $(O))/
>> >> +endif
>> >> +srcdir:=$(dir $(realpath $(MAKEFILE_LIST)))
>> >> +
>> >> +include $(srcdir)/Makefile.inc
>> >>  
>> >>  DESTDIR=/usr/local
>> >>  SBINDIR=/usr/sbin
>> >> @@ -  57,18 +65,30 @@
>> >>  LIBDIR=/usr/lib/openais
>> >>  endif
>> >>  
>> >> -  all:
>> >> -	(cd lcr; echo ==== `pwd` ===; $(MAKE) all);
>> >> -	(cd lib; echo ==== `pwd` ===; $(MAKE) all);
>> >> -	(cd exec; echo ==== `pwd` ===; $(MAKE) all);
>> >> -	(cd test; echo ==== `pwd` ===; $(MAKE) all);
>> >> +SUBDIRS:=$(builddir)lcr $(builddir)lib $(builddir)exec
>> $(builddir)test
>> >> +sub_make = srcdir=$(srcdir) builddir=$(builddir) subdir=$(1)/
>> $(MAKE)
>> >> -  I$(srcdir)$(1) -  f $(srcdir)$(1)/Makefile $(2)
>> >> +
>> >> +all: $(SUBDIRS)
>> >> +	@(cd $(builddir)lcr; echo ==== `pwd` ===;  $(call
>> sub_make,lcr,all));
>> >> +	@(cd $(builddir)lib; echo ==== `pwd` ===;  $(call
>> sub_make,lib,all));
>> >> +	@(cd $(builddir)exec; echo ==== `pwd` ===; $(call
>> sub_make,exec,all));
>> >> +	@(cd $(builddir)test; echo ==== `pwd` ===; $(call
>> sub_make,test,all));
>> >> +
>> >> +# subdirs are not phony
>> >> +.PHONY: all clean install doxygen
>> >> +
>> >> +$(builddir):
>> >> +	mkdir -  p $@
>> >> +
>> >> +$(SUBDIRS):
>> >> +	mkdir -  p $@
>> >>  
>> >>  clean:
>> >> -	(cd lcr; echo ==== `pwd` ===; $(MAKE) clean);
>> >> -	(cd lib; echo ==== `pwd` ===; $(MAKE) clean);
>> >> -	(cd exec; echo ==== `pwd` ===; $(MAKE) clean);
>> >> -	(cd test; echo ==== `pwd` ===; $(MAKE) clean);
>> >> -	rm -  rf doc/api
>> >> +	(cd $(builddir)lcr; echo ==== `pwd` ===; $(call
>> sub_make,lcr,clean));
>> >> +	(cd $(builddir)lib; echo ==== `pwd` ===; $(call
>> sub_make,lib,clean));
>> >> +	(cd $(builddir)exec; echo ==== `pwd` ===; $(call
>> >> sub_make,exec,clean));
>> >> +	(cd $(builddir)test; echo ==== `pwd` ===; $(call
>> >> sub_make,test,clean));
>> >> +	rm -  rf $(builddir)doc/api
>> >>  
>> >>  install:
>> >>  	mkdir -  p $(DESTDIR)$(SBINDIR)
>> >> @@ -  84,118 +104,118 @@
>> >>  	mkdir -  p $(DESTDIR)$(MANDIR)/man8
>> >>  	mkdir -  p $(DESTDIR)$(ETCDIR)/ld.so.conf.d
>> >>  
>> >> -	ln -  sf libais.so.2.0.0 lib/libais.so
>> >> -	ln -  sf libSaAmf.so.2.0.0 lib/libSaAmf.so
>> >> -	ln -  sf libSaClm.so.2.0.0 lib/libSaClm.so
>> >> -	ln -  sf libSaCkpt.so.2.0.0 lib/libSaCkpt.so
>> >> -	ln -  sf libSaEvt.so.2.0.0 lib/libSaEvt.so
>> >> -	ln -  sf libSaLck.so.2.0.0 lib/libSaLck.so
>> >> -	ln -  sf libSaMsg.so.2.0.0 lib/libSaMsg.so
>> >> -	ln -  sf libevs.so.2.0.0 lib/libevs.so
>> >> -	ln -  sf libcpg.so.2.0.0 lib/libcpg.so
>> >> -	ln -  sf libcfg.so.2.0.0 lib/libcfg.so
>> >> -	ln -  sf libtotem_pg.so.2.0.0 exec/libtotem_pg.so
>> >> -
>> >> -	ln -  sf libais.so.2.0.0 lib/libais.so.2
>> >> -	ln -  sf libSaAmf.so.2.0.0 lib/libSaAmf.so.2
>> >> -	ln -  sf libSaClm.so.2.0.0 lib/libSaClm.so.2
>> >> -	ln -  sf libSaCkpt.so.2.0.0 lib/libSaCkpt.so.2
>> >> -	ln -  sf libSaEvt.so.2.0.0 lib/libSaEvt.so.2
>> >> -	ln -  sf libSaLck.so.2.0.0 lib/libSaLck.so.2
>> >> -	ln -  sf libSaMsg.so.2.0.0 lib/libSaMsg.so.2
>> >> -	ln -  sf libevs.so.2.0.0 lib/libevs.so.2
>> >> -	ln -  sf libcpg.so.2.0.0 lib/libcpg.so.2
>> >> -	ln -  sf libcfg.so.2.0.0 lib/libcfg.so.2
>> >> -	ln -  sf libtotem_pg.so.2.0.0 exec/libtotem_pg.so.2
>> >> -
>> >> -	$(CP) -  a lib/libais.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaAmf.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaClm.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaCkpt.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaEvt.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaLck.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaMsg.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libevs.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libcpg.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libcfg.so $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a exec/libtotem_pg.so $(DESTDIR)$(LIBDIR)
>> >> -
>> >> -	$(CP) -  a lib/libais.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaAmf.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaClm.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaCkpt.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaEvt.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaLck.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libSaMsg.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libevs.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libcpg.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a lib/libcfg.so.2 $(DESTDIR)$(LIBDIR)
>> >> -	$(CP) -  a exec/libtotem_pg.so.2 $(DESTDIR)$(LIBDIR)
>> >> -
>> >> -	install -  m 755 lib/libais.so.2.* $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaAmf.so.2.*
$(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaClm.so.2.*
$(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaCkpt.so.2.*
$(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaEvt.so.2.*
$(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaLck.so.2.*
$(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaMsg.so.2.*
$(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libevs.so.2.* $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libcpg.so.2.* $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libcfg.so.2.* $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 exec/libtotem_pg.so.2.*
$(DESTDIR)$(LIBDIR)
>> >> +	( cd $(builddir) ;\
>> >> +	ln -  sf libais.so.2.0.0 lib/libais.so ;\
>> >> +	ln -  sf libSaAmf.so.2.0.0 lib/libSaAmf.so ;\
>> >> +	ln -  sf libSaClm.so.2.0.0 lib/libSaClm.so ;\
>> >> +	ln -  sf libSaCkpt.so.2.0.0 lib/libSaCkpt.so ;\
>> >> +	ln -  sf libSaEvt.so.2.0.0 lib/libSaEvt.so ;\
>> >> +	ln -  sf libSaLck.so.2.0.0 lib/libSaLck.so ;\
>> >> +	ln -  sf libSaMsg.so.2.0.0 lib/libSaMsg.so ;\
>> >> +	ln -  sf libevs.so.2.0.0 lib/libevs.so ;\
>> >> +	ln -  sf libcpg.so.2.0.0 lib/libcpg.so ;\
>> >> +	ln -  sf libcfg.so.2.0.0 lib/libcfg.so ;\
>> >> +	ln -  sf libtotem_pg.so.2.0.0 exec/libtotem_pg.so ;\
>> >> +	ln -  sf libais.so.2.0.0 lib/libais.so.2 ;\
>> >> +	ln -  sf libSaAmf.so.2.0.0 lib/libSaAmf.so.2 ;\
>> >> +	ln -  sf libSaClm.so.2.0.0 lib/libSaClm.so.2 ;\
>> >> +	ln -  sf libSaCkpt.so.2.0.0 lib/libSaCkpt.so.2 ;\
>> >> +	ln -  sf libSaEvt.so.2.0.0 lib/libSaEvt.so.2 ;\
>> >> +	ln -  sf libSaLck.so.2.0.0 lib/libSaLck.so.2 ;\
>> >> +	ln -  sf libSaMsg.so.2.0.0 lib/libSaMsg.so.2 ;\
>> >> +	ln -  sf libevs.so.2.0.0 lib/libevs.so.2 ;\
>> >> +	ln -  sf libcpg.so.2.0.0 lib/libcpg.so.2 ;\
>> >> +	ln -  sf libcfg.so.2.0.0 lib/libcfg.so.2 ;\
>> >> +	ln -  sf libtotem_pg.so.2.0.0 exec/libtotem_pg.so.2 ;\
>> >> +	);
>> >> +	$(CP) -  a $(builddir)lib/libais.so $(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaAmf.so
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaClm.so
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaCkpt.so
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaEvt.so
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaLck.so
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaMsg.so
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libevs.so $(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libcpg.so $(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libcfg.so $(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)exec/libtotem_pg.so
$(DESTDIR)$(LIBDIR)
>> >> +
>> >> +	$(CP) -  a $(builddir)lib/libais.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaAmf.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaClm.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaCkpt.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaEvt.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaLck.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libSaMsg.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libevs.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libcpg.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)lib/libcfg.so.2
$(DESTDIR)$(LIBDIR)
>> >> +	$(CP) -  a $(builddir)exec/libtotem_pg.so.2
$(DESTDIR)$(LIBDIR)
>> >> +
>> >> +	install -  m 755 $(builddir)lib/libais.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaAmf.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaClm.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaCkpt.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaEvt.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaLck.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaMsg.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libevs.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libcpg.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libcfg.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)exec/libtotem_pg.so.2.*
>> $(DESTDIR)$(LIBDIR)
>> >>  
>> >>  ifneq "NO" "$(STATICLIBS)"
>> >> -	install -  m 755 lib/libais.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaAmf.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaClm.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaCkpt.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaEvt.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaLck.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libSaMsg.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libevs.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libcpg.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libevs.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libcpg.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 lib/libcfg.a $(DESTDIR)$(LIBDIR)
>> >> -	install -  m 755 exec/libtotem_pg.a $(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libais.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaAmf.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaClm.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaCkpt.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaEvt.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaLck.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libSaMsg.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libevs.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libcpg.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libevs.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libcpg.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)lib/libcfg.a
$(DESTDIR)$(LIBDIR)
>> >> +	install -  m 755 $(builddir)exec/libtotem_pg.a
>> $(DESTDIR)$(LIBDIR)
>> >>  endif
>> >>  
>> >>  	echo $(LIBDIR) >
$(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais-
>> $(ARCH).conf
>> >>  
>> >> -	install -  m 755 exec/*lcrso $(DESTDIR)$(LCRSODIR)
>> >> +	install -  m 755 $(builddir)exec/*lcrso
$(DESTDIR)$(LCRSODIR)
>> >>  
>> >> -	install -  m 755 exec/aisexec $(DESTDIR)$(SBINDIR)
>> >> -	install -  m 700 exec/keygen $(DESTDIR)$(SBINDIR)/ais- 
keygen
>> >> -	install -  m 644 conf/openais.conf
$(DESTDIR)$(ETCDIR)/ais
>> >> -	install -  m 644 conf/amf.conf $(DESTDIR)$(ETCDIR)/ais
>> >> -
>> >> -	install -  m 644 include/saAis.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/saAmf.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/saClm.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/saCkpt.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/saEvt.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/saEvt.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/saLck.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/saMsg.h
$(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/cpg.h $(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/cfg.h $(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 include/evs.h $(DESTDIR)$(INCLUDEDIR)
>> >> -	install -  m 644 exec/aispoll.h
$(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> -	install -  m 644 exec/totempg.h
$(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> -	install -  m 644 exec/totem.h
$(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> -	install -  m 644 exec/totemip.h
$(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> -	install -  m 644 lcr/lcr_ckpt.h
$(DESTDIR)$(INCLUDEDIR_LCR)
>> >> -	install -  m 644 lcr/lcr_comp.h
$(DESTDIR)$(INCLUDEDIR_LCR)
>> >> -	install -  m 644 lcr/lcr_ifact.h
$(DESTDIR)$(INCLUDEDIR_LCR)
>> >> -	install -  m 644 exec/service.h
$(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> -	install -  m 644 exec/timer.h
$(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> -	install -  m 644 exec/objdb.h
$(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> -	install -  m 644 exec/print.h
$(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> -	install -  m 644 exec/config.h
$(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> -	install -  m 644 include/swab.h
$(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> -	install -  m 644 man/*.3 $(DESTDIR)$(MANDIR)/man3
>> >> -	install -  m 644 man/*.5 $(DESTDIR)$(MANDIR)/man5
>> >> -	install -  m 644 man/*.8 $(DESTDIR)$(MANDIR)/man8
>> >> +	install -  m 755 $(builddir)exec/aisexec
$(DESTDIR)$(SBINDIR)
>> >> +	install -  m 700 $(builddir)exec/keygen
$(DESTDIR)$(SBINDIR)/ais-
>> keygen
>> >> +	install -  m 644 $(srcdir)conf/openais.conf
>> $(DESTDIR)$(ETCDIR)/ais
>> >> +	install -  m 644 $(srcdir)conf/amf.conf
$(DESTDIR)$(ETCDIR)/ais
>> >> +
>> >> +	install -  m 644 $(srcdir)include/saAis.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/saAmf.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/saClm.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/saCkpt.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/saEvt.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/saEvt.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/saLck.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/saMsg.h
>> $(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/cpg.h
$(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/cfg.h
$(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)include/evs.h
$(DESTDIR)$(INCLUDEDIR)
>> >> +	install -  m 644 $(srcdir)exec/aispoll.h
>> $(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> +	install -  m 644 $(srcdir)exec/totempg.h
>> $(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> +	install -  m 644 $(srcdir)exec/totem.h
>> $(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> +	install -  m 644 $(srcdir)exec/totemip.h
>> $(DESTDIR)$(INCLUDEDIR_TOTEM)
>> >> +	install -  m 644 $(srcdir)lcr/lcr_ckpt.h
>> $(DESTDIR)$(INCLUDEDIR_LCR)
>> >> +	install -  m 644 $(srcdir)lcr/lcr_comp.h
>> $(DESTDIR)$(INCLUDEDIR_LCR)
>> >> +	install -  m 644 $(srcdir)lcr/lcr_ifact.h
>> $(DESTDIR)$(INCLUDEDIR_LCR)
>> >> +	install -  m 644 $(srcdir)exec/service.h
>> $(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> +	install -  m 644 $(srcdir)exec/timer.h
>> $(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> +	install -  m 644 $(srcdir)exec/objdb.h
>> $(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> +	install -  m 644 $(srcdir)exec/print.h
>> $(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> +	install -  m 644 $(srcdir)exec/config.h
>> $(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> +	install -  m 644 $(srcdir)include/swab.h
>> $(DESTDIR)$(INCLUDEDIR_SERVICE)
>> >> +	install -  m 644 $(srcdir)man/*.3
$(DESTDIR)$(MANDIR)/man3
>> >> +	install -  m 644 $(srcdir)man/*.5
$(DESTDIR)$(MANDIR)/man5
>> >> +	install -  m 644 $(srcdir)man/*.8
$(DESTDIR)$(MANDIR)/man8
>> >>  
>> >>  doxygen:
>> >>  	doxygen
>> >> diff -  Nur -  x '*.svn' -  x '*.git' ais-  clean/Makefile.inc
>> >> ais-  make/Makefile.inc
>> >> ---   ais-  clean/Makefile.inc	2007-  07-  04
14:31:21.000000000
>> +1200
>> >> +++ ais-  make/Makefile.inc	2007-  07-  04
21:43:52.000000000 +1200
>> >> @@ -  101,3 +101,8 @@
>> >>  	override CFLAGS += -  DHAVE_GETPEERUCRED - 
DHAVE_SCANDIR -
>> DHAVE_ALPHASORT
>> >>  endif
>> >>  endif
>> >> +
>> >> +VPATH:=. $(srcdir) $(srcdir)$(subdir)
>> >> +
>> >> +
>> >> +
>> >> diff -  Nur -  x '*.svn' -  x '*.git' ais-  clean/test/Makefile
>> >> ais-  make/test/Makefile
>> >> ---   ais-  clean/test/Makefile	2007-  07-  04
14:30:35.000000000
>> +1200
>> >> +++ ais-  make/test/Makefile	2007-  07-  04
22:08:29.000000000 +1200
>> >> @@ -  44,7 +44,7 @@
>> >>  CFLAGS += -  I../include
>> >>  LDFLAGS += -  L../lib
>> >>  
>> >> -  EXTRA_CFLAGS = -  I../include
>> >> +EXTRA_CFLAGS = -  I$(srcdir)include
>> >>  TEST_SRC =  testclm.c testamf1.c \
>> >>  	testamf4.c testamf5.c testamf6.c testamfth.c  \
>> >>  	testckpt.c ckptstress.c ckptbench.c  \
>> >> 
>> >> _______________________________________________
>> >> Openais mailing list
>> >> Openais at lists.linux-  foundation.org
>> >> https://lists.linux-  foundation.org/mailman/listinfo/openais
>> 
>> 
>> NOTICE: This message contains privileged and confidential
>> information intended only for the use of the addressee
>> named above. If you are not the intended recipient of
>> this message you are hereby notified that you must not
>> disseminate, copy or take any action in reliance on it.
>> If you have received this message in error please
>> notify Allied Telesis Labs Ltd immediately.
>> Any views expressed in this message are those of the
>> individual sender, except where the sender has the
>> authority to issue and specifically states them to
>> be the views of Allied Telesis Labs.



More information about the Openais mailing list