[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.00-6-gf5e3731
fabbione at sourceware.org
fabbione at sourceware.org
Wed Apr 30 06:03:31 UTC 2008
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=f5e37313d2fbae564acf0801b3e8c57a4bf1f815
The branch, master has been updated
via f5e37313d2fbae564acf0801b3e8c57a4bf1f815 (commit)
from 91a32add490287c17a1aef64b0f3eb356c092a5d (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 f5e37313d2fbae564acf0801b3e8c57a4bf1f815
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date: Wed Apr 30 08:02:35 2008 +0200
[BUILD] Change build system to cope with new libdlmcontrol
Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
-----------------------------------------------------------------------
Summary of changes:
configure | 22 ++++++++++++++++++----
dlm/Makefile | 2 +-
dlm/{lib => libdlm}/51-dlm.rules | 0
dlm/{lib => libdlm}/Makefile | 0
dlm/{lib => libdlm}/libaislock.c | 0
dlm/{lib => libdlm}/libaislock.h | 0
dlm/{lib => libdlm}/libdlm.c | 0
dlm/{lib => libdlm}/libdlm.h | 0
dlm/{lib => libdlm}/libdlm_internal.h | 0
dlm/tests/usertest/Makefile | 2 +-
dlm/tool/Makefile | 12 ++++++++----
group/dlm_controld/Makefile | 10 +++++++---
make/defines.mk.input | 2 ++
13 files changed, 37 insertions(+), 13 deletions(-)
rename dlm/{lib => libdlm}/51-dlm.rules (100%)
rename dlm/{lib => libdlm}/Makefile (100%)
rename dlm/{lib => libdlm}/libaislock.c (100%)
rename dlm/{lib => libdlm}/libaislock.h (100%)
rename dlm/{lib => libdlm}/libdlm.c (100%)
rename dlm/{lib => libdlm}/libdlm.h (100%)
rename dlm/{lib => libdlm}/libdlm_internal.h (100%)
diff --git a/configure b/configure
index 896eeff..c1dba32 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,
fencedincdir => \$fenceincdir,
@@ -127,6 +129,8 @@ my $err = &GetOptions (\%options,
'cmanlibdir=s',
'dlmincdir=s',
'dlmlibdir=s',
+ 'dlmcontrolincdir=s',
+ 'dlmcontrollibdir=s',
'fenceincdir=s',
'fencelibdir=s',
'fencedincdir=s',
@@ -219,8 +223,10 @@ if ($help || !$err) {
print "--ccslibdir=\tthe base directory for ccs libraries. (Default: ./ccs/lib)\n";
print "--cmanincdir=\tthe base directory for cman include files. (Default: ./cman/lib)\n";
print "--cmanlibdir=\tthe base directory for cman libraries. (Default: ./cman/lib)\n";
- print "--dlmincdir=\tthe base directory for dlm include files. (Default: ./dlm/lib)\n";
- print "--dlmlibdir=\tthe base directory for dlm libraries. (Default: ./dlm/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 "--fencedincdir=\tthe base directory for fenced include files. (Default: ./fence/libfenced)\n";
@@ -422,10 +428,16 @@ if (!$cmanlibdir) {
$cmanlibdir="${objdir}/cman/lib";
}
if (!$dlmincdir) {
- $dlmincdir="${cdir}/dlm/lib";
+ $dlmincdir="${cdir}/dlm/libdlm";
}
if (!$dlmlibdir) {
- $dlmlibdir="${objdir}/dlm/lib";
+ $dlmlibdir="${objdir}/dlm/libdlm";
+}
+if (!$dlmcontrolincdir) {
+ $dlmcontrolincdir="${cdir}/dlm/libdlmcontrol";
+}
+if (!$dlmcontrollibdir) {
+ $dlmcontrollibdir="${objdir}/dlm/libdlmcontrol";
}
if (!$fenceincdir) {
$fenceincdir="${cdir}/fence/libfence";
@@ -633,6 +645,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/\@FENCEDINCDIR\@/$fencedincdir/;
diff --git a/dlm/Makefile b/dlm/Makefile
index 0e6c832..484b009 100644
--- a/dlm/Makefile
+++ b/dlm/Makefile
@@ -13,4 +13,4 @@
include ../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=lib tool man
+SUBDIRS=libdlm libdlmcontrol tool man
diff --git a/dlm/lib/51-dlm.rules b/dlm/libdlm/51-dlm.rules
similarity index 100%
rename from dlm/lib/51-dlm.rules
rename to dlm/libdlm/51-dlm.rules
diff --git a/dlm/lib/Makefile b/dlm/libdlm/Makefile
similarity index 100%
rename from dlm/lib/Makefile
rename to dlm/libdlm/Makefile
diff --git a/dlm/lib/libaislock.c b/dlm/libdlm/libaislock.c
similarity index 100%
rename from dlm/lib/libaislock.c
rename to dlm/libdlm/libaislock.c
diff --git a/dlm/lib/libaislock.h b/dlm/libdlm/libaislock.h
similarity index 100%
rename from dlm/lib/libaislock.h
rename to dlm/libdlm/libaislock.h
diff --git a/dlm/lib/libdlm.c b/dlm/libdlm/libdlm.c
similarity index 100%
rename from dlm/lib/libdlm.c
rename to dlm/libdlm/libdlm.c
diff --git a/dlm/lib/libdlm.h b/dlm/libdlm/libdlm.h
similarity index 100%
rename from dlm/lib/libdlm.h
rename to dlm/libdlm/libdlm.h
diff --git a/dlm/lib/libdlm_internal.h b/dlm/libdlm/libdlm_internal.h
similarity index 100%
rename from dlm/lib/libdlm_internal.h
rename to dlm/libdlm/libdlm_internal.h
diff --git a/dlm/tests/usertest/Makefile b/dlm/tests/usertest/Makefile
index d142da2..44be354 100644
--- a/dlm/tests/usertest/Makefile
+++ b/dlm/tests/usertest/Makefile
@@ -26,7 +26,7 @@ CFLAGS += -I${dlmincdir}
LDFLAGS += -L${dlmlibdir} -ldlm -lpthread
depends:
- $(MAKE) -C ../../lib all
+ $(MAKE) -C ../../libdlm all
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index dea1730..6612672 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -14,7 +14,7 @@ TARGET= dlm_tool
SBINDIRT=$(TARGET)
-all: ${TARGET}
+all: depends ${TARGET}
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -24,12 +24,12 @@ include $(OBJDIR)/make/uninstall.mk
OBJS= main.o
-CFLAGS += -I${dlmincdir}
+CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir}
CFLAGS += -I$(SRCDIR)/group/dlm_controld/
-CFLAGS += -I${incdir} -I../libdlmcontrol
+CFLAGS += -I${incdir}
CFLAGS += -I${KERNEL_SRC}/include/
-LDFLAGS += -L${dlmlibdir} -L../libdlmcontrol -ldlm -ldlmcontrol
+LDFLAGS += -L${dlmlibdir} -L${dlmcontrollibdir} -ldlm -ldlmcontrol
${TARGET}: ${OBJS}
@@ -37,4 +37,8 @@ ${TARGET}: ${OBJS}
clean: generalclean
+depends:
+ $(MAKE) -C ../libdlm all
+ $(MAKE) -C ../libdlmcontrol all
+
-include $(OBJS:.o=.d)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 7459f6b..e5f88b0 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -33,12 +33,16 @@ OBJS= action.o \
plock.o \
group.o
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${openaisincdir} -I${fencedincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir}
+CFLAGS += -I${openaisincdir} -I${fencedincdir}
CFLAGS += -I${KERNEL_SRC}/include/
CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
-CFLAGS += -I${incdir} -I../../dlm/libdlmcontrol/
+CFLAGS += -I${incdir}
-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${dlmlibdir} -L${fencedlibdir} -lccs -lcman -ldlm -lfenced
+LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
+LDFLAGS += -L${dlmlibdir} -L${dlmlibcontroldir} -ldlm -ldlmcontrol
+LDFLAGS += -L${fencedlibdir} -lfenced
LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
LDFLAGS += -L../lib -lgroup
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 7c5ac6a..ef9673f 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -48,6 +48,8 @@ cmanincdir ?= @CMANINCDIR@
cmanlibdir ?= @CMANLIBDIR@
dlmincdir ?= @DLMINCDIR@
dlmlibdir ?= @DLMLIBDIR@
+dlmcontrolincdir ?= @DLMCONTROLINCDIR@
+dlmcontrollibdir ?= @DLMCONTROLLIBDIR@
fenceincdir ?= @FENCEINCDIR@
fencelibdir ?= @FENCELIBDIR@
fencedincdir ?= @FENCEDINCDIR@
hooks/post-receive
--
Cluster Project
More information about the Cluster-devel
mailing list