From: fabbione@sourceware.org <fabbione@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/gnbd client/Makefile server/Makefile t ...
Date: 22 Dec 2007 13:52:33 -0000 [thread overview]
Message-ID: <20071222135233.8249.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-12-22 13:52:33
Modified files:
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
gnbd/utils : Makefile
Log message:
Fix gnbd build dependencies. For too long we did rely on gnbd/Makefile
to build in the right order but single builds were broken.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
--- cluster/gnbd/client/Makefile 2007/12/22 13:36:56 1.20
+++ cluster/gnbd/client/Makefile 2007/12/22 13:52:32 1.21
@@ -16,7 +16,7 @@
SBINDIRT=$(TARGET1) $(TARGET2)
-all: ${TARGET1} ${TARGET2}
+all: depends ${TARGET1} ${TARGET2}
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -39,11 +39,13 @@
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
+depends:
+ $(MAKE) -C ../utils all
+
clean: generalclean
--- cluster/gnbd/server/Makefile 2007/12/22 13:36:56 1.20
+++ cluster/gnbd/server/Makefile 2007/12/22 13:52:32 1.21
@@ -16,7 +16,7 @@
SBINDIRT=$(TARGET1) $(TARGET2)
-all: ${TARGET1} ${TARGET2}
+all: depends ${TARGET1} ${TARGET2}
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -44,11 +44,13 @@
LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
+depends:
+ $(MAKE) -C ../utils all
+
clean: generalclean
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 13:36:56 1.21
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 13:52:32 1.22
@@ -15,7 +15,7 @@
SBINDIRT=$(TARGET) gnbd_get_uid
-all: ${TARGET} gnbd_get_uid
+all: depends ${TARGET} gnbd_get_uid
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -34,11 +34,13 @@
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
gnbd_get_uid:
cp $(S)/$@ $@
+depends:
+ $(MAKE) -C ../../utils all
+
clean: generalclean
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 13:36:57 1.18
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 13:52:32 1.19
@@ -15,7 +15,7 @@
SBINDIRT=$(TARGET)
-all: ${TARGET}
+all: depends ${TARGET}
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -35,8 +35,11 @@
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
+depends:
+ $(MAKE) -C ../../utils all
+ $(MAKE) -C ../../client monitor_req.o
+
clean: generalclean
--- cluster/gnbd/utils/Makefile 2007/12/22 13:36:57 1.6
+++ cluster/gnbd/utils/Makefile 2007/12/22 13:52:33 1.7
@@ -26,5 +26,4 @@
CFLAGS += -I${cmanincdir}
CFLAGS += -I$(S)/../include
-
clean: generalclean
reply other threads:[~2007-12-22 13:52 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=20071222135233.8249.qmail@sourceware.org \
--to=fabbione@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox