From: cfeist@sourceware.org <cfeist@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster fence/fenced/Makefile group/configure ...
Date: 7 Jul 2006 16:14:35 -0000 [thread overview]
Message-ID: <20060707161435.10331.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: cfeist at sourceware.org 2006-07-07 16:14:34
Modified files:
fence/fenced : Makefile
group : configure
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/make : defines.mk.input
Log message:
Makefile fixes to assist with rpm building.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/configure.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/make/defines.mk.input.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- cluster/fence/fenced/Makefile 2006/06/30 15:38:39 1.5
+++ cluster/fence/fenced/Makefile 2006/07/07 16:14:33 1.6
@@ -22,8 +22,11 @@
-I${ccsincdir} \
-I${incdir} \
-I${top_srcdir}/config \
+ -I${top_srcdir}/../cman/lib \
-I${top_srcdir}/../group/lib
+LDFLAGS += -L${top_srcdir}/../cman/lib
+
all: ${TARGET}
${TARGET}: \
@@ -34,7 +37,7 @@
agent.o \
../../ccs/lib/libccs.a \
../../group/lib/libgroup.a
- $(CC) -lcman -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^ -lcman
main.o: main.c fd.h
$(CC) $(CFLAGS) -c -o $@ $<
--- cluster/group/configure 2006/06/09 20:59:57 1.1
+++ cluster/group/configure 2006/07/07 16:14:33 1.2
@@ -30,6 +30,7 @@
kernel_src => \$kernel_src,
libdir => \$libdir,
iddevlibdir => \$iddevlibdir,
+ cmanlibdir => \$cmanlibdir,
mandir => \$mandir,
prefix => \$prefix,
sbindir => \$sbindir,
@@ -44,6 +45,7 @@
'kernel_src=s',
'libdir=s',
'iddevlibdir=s',
+ 'cmanlibdir=s',
'mandir=s',
'prefix=s',
'sbindir=s',
@@ -68,6 +70,7 @@
print "--kernel_src=\tthe directory containing the kernel source you wish to\n\t\tcompile against. (Default: system dependant)\n";
print "--libdir=\tthe base directory for libraries. (Default: /usr/lib)\n";
print "--iddevlibdir=\tthe base directory for libraries. (Default: {libdir})\n";
+ print "--cmanlibdir=\tthe base directory for cman libraries. (Default: {libdir})\n";
print "--mandir=\tthe base directory for man pages. (Default: /usr/share/man)\n";
print "--prefix=\tthe base directory to install into. (Default: /)\n";
print "--sbindir=\tthe base directory for system binaries. (Default: /sbin)\n";
@@ -96,6 +99,9 @@
if (!$iddevlibdir) {
$iddevlibdir="${libdir}";
}
+if (!$cmanlibdir) {
+ $cmanlibdir="${libdir}";
+}
if (!$mandir) {
$mandir="${prefix}/usr/share/man";
}
@@ -121,6 +127,7 @@
$_ =~ s/\@KERNEL_SRC\@/$kernel_src/;
$_ =~ s/\@LIBDIR\@/$libdir/;
$_ =~ s/\@IDDEVLIBDIR\@/$iddevlibdir/;
+ $_ =~ s/\@CMANLIBDIR\@/$cmanlibdir/;
$_ =~ s/\@MANDIR\@/$mandir/;
$_ =~ s/\@SBINDIR\@/$sbindir/;
$_ =~ s/\@SHAREDIR\@/$sharedir/;
--- cluster/group/daemon/Makefile 2006/06/30 15:29:17 1.13
+++ cluster/group/daemon/Makefile 2006/07/07 16:14:34 1.14
@@ -15,7 +15,7 @@
UNINSTALL=${top_srcdir}/scripts/uninstall.pl
CFLAGS+= -g -I. -I../include/ -I../../cman/lib/ -I../lib/
-LDFLAGS+= -L/usr/lib/openais -L/usr/lib
+LDFLAGS+= -L${cmanlibdir} -L/usr/lib/openais -L/usr/lib
TARGET=groupd
@@ -26,7 +26,7 @@
cman.o \
joinleave.o \
main.o
- $(CC) $(LDFLAGS) -lcman -lcpg -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^ -lcman -lcpg
app.o: app.c gd_internal.h
$(CC) $(CFLAGS) -c -o $@ $<
--- cluster/group/dlm_controld/Makefile 2006/06/30 15:36:52 1.2
+++ cluster/group/dlm_controld/Makefile 2006/07/07 16:14:34 1.3
@@ -20,8 +20,11 @@
CFLAGS+= -idirafter ${KERNEL_SRC}/include/linux \
-I../../group/lib/ \
-I../../ccs/lib/ \
+ -I../../cman/lib/ \
-I../include/
+LDFLAGS+= -L../../cman/lib
+
TARGET=dlm_controld
@@ -36,7 +39,7 @@
action.o \
../lib/libgroup.a \
../../ccs/lib/libccs.a
- $(CC) $(LDFLAGS) -lcman -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^ -lcman
main.o: main.c
$(CC) $(CFLAGS) -c -o $@ $<
--- cluster/group/gfs_controld/Makefile 2006/06/30 15:35:23 1.3
+++ cluster/group/gfs_controld/Makefile 2006/07/07 16:14:34 1.4
@@ -19,9 +19,10 @@
-idirafter ${KERNEL_SRC}/include/linux \
-I${incdir} \
-I${top_srcdir}/config \
+ -I../../cman/lib \
-I../include/ \
-I../lib/
-LDFLAGS+= -L/usr/lib/openais -L/usr/lib
+LDFLAGS+= -L../../cman/lib -L/usr/lib/openais -L/usr/lib
TARGET=gfs_controld
@@ -37,7 +38,7 @@
plock.o \
recover.o \
../lib/libgroup.a
- $(CC) $(LDFLAGS) -lcman -lcpg -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^ -lcman -lcpg
main.o: main.c
--- cluster/group/make/defines.mk.input 2006/06/09 20:59:57 1.1
+++ cluster/group/make/defines.mk.input 2006/07/07 16:14:34 1.2
@@ -16,6 +16,7 @@
mandir ?= ${DESTDIR}/@MANDIR@
libdir ?= ${DESTDIR}/@LIBDIR@
iddevlibdir ?= ${DESTDIR}/@IDDEVLIBDIR@
+cmanlibdir ?= ${DESTDIR}/@CMANLIBDIR@
incdir ?= ${DESTDIR}/@INCDIR@
gfskincdir ?= ${DESTDIR}/@GFSKINCDIR@
iddevincdir ?= ${DESTDIR}/@IDDEVINCDIR@
reply other threads:[~2006-07-07 16:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060707161435.10331.qmail@sourceware.org \
--to=cfeist@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.