Cluster Project branch, master, updated. cluster-2.99.03-11-ga1a9382

Cluster Project branch, master, updated. cluster-2.99.03-11-ga1a9382

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a1a9382b9fb73087ae57ff7d16ad053495141f6f

The branch, master has been updated
       via  a1a9382b9fb73087ae57ff7d16ad053495141f6f (commit)
      from  1e1bf34e411185164b3d93d5ef94fa0d944b971c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a1a9382b9fb73087ae57ff7d16ad053495141f6f
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Fri Jun 6 08:30:42 2008 +0200

    [BUILD] Switch libdlmcontrol back to shared library
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 configure                   |   14 ++++++++++++++
 dlm/libdlmcontrol/Makefile  |   19 ++++++++++++++++++-
 dlm/tool/Makefile           |    7 +++----
 group/dlm_controld/Makefile |    4 ++--
 make/defines.mk.input       |    2 ++
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 871639a..d00f197 100755
--- a/configure
+++ b/configure
@@ -52,6 +52,8 @@ my %options = (
 	cmanlibdir => \$cmanlibdir,
 	dlmincdir => \$dlmincdir,
 	dlmlibdir => \$dlmlibdir,
+	dlmcontrolincdir => \$dlmcontrolincdir,
+	dlmcontrollibdir => \$dlmcontrollibdir,
 	fenceincdir => \$fenceincdir,
 	fencelibdir => \$fencelibdir,
 	volidincdir => \$volidincdir,
@@ -127,6 +129,8 @@ my $err = &GetOptions (\%options,
 		    'cmanlibdir=s',
 		    'dlmincdir=s',
 		    'dlmlibdir=s',
+		    'dlmcontrolincdir=s',
+		    'dlmcontrollibdir=s',
 		    'fenceincdir=s',
 		    'fencelibdir=s',
 		    'volidincdir=s',
@@ -222,6 +226,8 @@ if ($help || !$err) {
   print "--cmanlibdir=\tthe base directory for cman libraries.  (Default: ./cman/lib)\n";
   print "--dlmincdir=\tthe base directory for dlm include files.  (Default: ./dlm/libdlm)\n";
   print "--dlmlibdir=\tthe base directory for dlm libraries.  (Default: ./dlm/libdlm)\n";
+  print "--dlmcontrolincdir=\tthe base directory for dlmcontrol include files.  (Default: ./dlm/libdlmcontrol)\n";
+  print "--dlmcontrollibdir=\tthe base directory for dlmcontrol libraries.  (Default: ./dlm/libdlmcontrol)\n";
   print "--fenceincdir=\tthe base directory for fence include files.  (Default: ./fence/libfence)\n";
   print "--fencelibdir=\tthe base directory for fence libraries.  (Default: ./fence/libfence)\n";
   print "--volidincdir=\tthe base directory for volume_id include files.  (Default: {incdir})\n";
@@ -427,6 +433,12 @@ if (!$dlmincdir) {
 if (!$dlmlibdir) {
   $dlmlibdir="${objdir}/dlm/libdlm";
 }
+if (!$dlmcontrolincdir) {
+  $dlmcontrolincdir="${cdir}/dlm/libdlmcontrol";
+}
+if (!$dlmcontrollibdir) {
+  $dlmcontrollibdir="${objdir}/dlm/libdlmcontrol";
+}
 if (!$fenceincdir) {
   $fenceincdir="${cdir}/fence/libfence";
 }
@@ -637,6 +649,8 @@ while (<IFILE>) {
   $_ =~ s/\@CMANLIBDIR\@/$cmanlibdir/;
   $_ =~ s/\@DLMINCDIR\@/$dlmincdir/;
   $_ =~ s/\@DLMLIBDIR\@/$dlmlibdir/;
+  $_ =~ s/\@DLMCONTROLINCDIR\@/$dlmcontrolincdir/;
+  $_ =~ s/\@DLMCONTROLLIBDIR\@/$dlmcontrollibdir/;
   $_ =~ s/\@FENCEINCDIR\@/$fenceincdir/;
   $_ =~ s/\@FENCELIBDIR\@/$fencelibdir/;
   $_ =~ s/\@VOLIDINCDIR\@/$volidincdir/;
diff --git a/dlm/libdlmcontrol/Makefile b/dlm/libdlmcontrol/Makefile
index d7c96b7..30447f3 100644
--- a/dlm/libdlmcontrol/Makefile
+++ b/dlm/libdlmcontrol/Makefile
@@ -12,9 +12,21 @@
 
 TARGET= libdlmcontrol
 
-all: $(TARGET).a
+LIBDIRT=$(TARGET).a \
+	$(TARGET).so.$(SOMAJOR).$(SOMINOR)
+
+LIBSYMT=$(TARGET).so \
+	$(TARGET).so.$(SOMAJOR)
+
+INCDIRT=$(TARGET).h
 
 include ../../make/defines.mk
+
+SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
+STATICLIB=$(TARGET).a
+
+all: $(STATICLIB) $(SHAREDLIB)
+
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
@@ -31,6 +43,11 @@ $(TARGET).a: $(OBJS)
 	${AR} r $@ $^
 	${RANLIB} $@
 
+$(TARGET).so.${SOMAJOR}.${SOMINOR}: $(OBJS)
+	$(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $< $(LDFLAGS)
+	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so
+	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so.$(SOMAJOR)
+
 clean: generalclean
 
 -include $(OBJS:.o=.d)
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index 491565d..6612672 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -24,14 +24,13 @@ include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o
 
-CFLAGS += -I${dlmincdir} 
-CFLAGS += -I$(S)/../libdlmcontrol
+CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir}
 CFLAGS += -I$(SRCDIR)/group/dlm_controld/
 CFLAGS += -I${incdir}
 CFLAGS += -I${KERNEL_SRC}/include/
 
-LDFLAGS += -L${dlmlibdir} -ldlm 
-LDFLAGS += -L../libdlmcontrol -ldlmcontrol
+LDFLAGS += -L${dlmlibdir} -L${dlmcontrollibdir} -ldlm -ldlmcontrol
+
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index c4bda25..bc10908 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -33,9 +33,9 @@ OBJS=	action.o \
 	plock.o \
 	group.o
 
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${dlmcontrolincdir}
 CFLAGS += -I${openaisincdir}
-CFLAGS += -I$(SRCDIR)/dlm/libdlmcontrol/ -I$(SRCDIR)/fence/libfenced/
+CFLAGS += -I$(SRCDIR)/fence/libfenced/
 CFLAGS += -I${KERNEL_SRC}/include/
 CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
 CFLAGS += -I${incdir}
diff --git a/make/defines.mk.input b/make/defines.mk.input
index cfd9a9d..d5c3a75 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -49,6 +49,8 @@ cmanincdir ?= @CMANINCDIR@
 cmanlibdir ?= @CMANLIBDIR@
 dlmincdir ?= @DLMINCDIR@
 dlmlibdir ?= @DLMLIBDIR@
+dlmcontrolincdir ?= @DLMCONTROLINCDIR@
+dlmcontrollibdir ?= @DLMCONTROLLIBDIR@
 fenceincdir ?= @FENCEINCDIR@
 fencelibdir ?= @FENCELIBDIR@
 volidincdir ?= @VOLIDINCDIR@


hooks/post-receive
--
Cluster Project