FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 03-24-2008, 01:18 PM
 
Default Cluster Project branch, master, updated. gfs-kernel_0_1_22-95-gb83c377

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=b83c377a29 7a79e45cb7a268bdad2680f81ef4df

The branch, master has been updated
via b83c377a297a79e45cb7a268bdad2680f81ef4df (commit)
via 2ce223c19f4bc860d6dd2c916addff40533afb19 (commit)
from 53bfde1e82343cfa5d2c713f97372beecee60eb6 (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 b83c377a297a79e45cb7a268bdad2680f81ef4df
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Mon Mar 24 14:41:07 2008 +0100

[BUILD] Set -MMD as default CFLAGS

Enable non-system header files dependency tracking by using -MMD
in combination with -include .d files.

This change will allow developers to edit an header file
and simply fire a make to rebuild all the objects that are affect
by the header change.
Before this change a make clean and make were required to propagate
the header change.

NOTE to developers: you will need to rerun a configure to set
-MMD in the default CFLAGS. All directories that builds objects
now have a bunch of extra .d files that can be safely ignored
as they are automatically generated and ignored by git.

Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>

commit 2ce223c19f4bc860d6dd2c916addff40533afb19
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Mon Mar 24 14:40:28 2008 +0100

[BUILD] Update .gitignore for .o and .d files

Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>

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

Summary of changes:
.gitignore | 2 ++
ccs/ccs_test/Makefile | 2 ++
ccs/ccs_tool/Makefile | 2 ++
ccs/ccsais/Makefile | 2 ++
ccs/daemon/Makefile | 2 ++
ccs/lib/Makefile | 2 ++
ccs/lib/libccs.c | 1 +
cman/cman_tool/Makefile | 2 ++
cman/daemon/Makefile | 2 ++
cman/lib/Makefile | 8 ++++++--
cman/qdisk/Makefile | 4 ++++
configure | 2 +-
dlm/lib/Makefile | 4 ++++
dlm/tool/Makefile | 2 ++
fence/agents/ipmilan/Makefile | 2 ++
fence/agents/rackswitch/Makefile | 2 ++
fence/agents/rps10/Makefile | 2 ++
fence/agents/xvm/Makefile | 5 +++++
fence/fence_node/Makefile | 2 ++
fence/fence_tool/Makefile | 2 ++
fence/fenced/Makefile | 2 ++
gfs/gfs_debug/Makefile | 2 ++
gfs/gfs_edit/Makefile | 2 ++
gfs/gfs_fsck/Makefile | 3 +--
gfs/gfs_grow/Makefile | 2 ++
gfs/gfs_jadd/Makefile | 2 ++
gfs/gfs_mkfs/Makefile | 2 ++
gfs/gfs_quota/Makefile | 2 ++
gfs/gfs_tool/Makefile | 2 ++
gfs/libgfs/Makefile | 2 ++
gfs/tests/filecon2/Makefile | 4 ++--
gfs/tests/mmdd/Makefile | 8 +++++---
gfs2/convert/Makefile | 2 ++
gfs2/edit/Makefile | 2 ++
gfs2/fsck/Makefile | 1 -
gfs2/libgfs2/Makefile | 3 +++
gfs2/mkfs/Makefile | 2 ++
gfs2/mount/Makefile | 4 ++++
gfs2/quota/Makefile | 2 ++
gfs2/tool/Makefile | 2 ++
gnbd/client/Makefile | 4 ++++
gnbd/server/Makefile | 4 ++++
gnbd/tools/fence_gnbd/Makefile | 2 ++
gnbd/tools/gnbd_export/Makefile | 2 ++
gnbd/tools/gnbd_import/Makefile | 2 ++
gnbd/utils/Makefile | 6 ++++--
group/daemon/Makefile | 2 ++
group/dlm_controld/Makefile | 2 ++
group/gfs_controld/Makefile | 2 ++
group/lib/Makefile | 5 ++++-
rgmanager/src/clulib/Makefile | 4 ++++
rgmanager/src/daemons/Makefile | 6 ++++++
rgmanager/src/utils/Makefile | 21 ++++++++++++++++-----
53 files changed, 146 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5bce701..6df816f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
make/defines.mk
+*.d
+*.o
diff --git a/ccs/ccs_test/Makefile b/ccs/ccs_test/Makefile
index e9a8f48..81a3298 100644
--- a/ccs/ccs_test/Makefile
+++ b/ccs/ccs_test/Makefile
@@ -40,3 +40,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile
index 078a84a..a375a7e 100644
--- a/ccs/ccs_tool/Makefile
+++ b/ccs/ccs_tool/Makefile
@@ -46,3 +46,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/ccs/ccsais/Makefile b/ccs/ccsais/Makefile
index 2084c0b..49b14d3 100644
--- a/ccs/ccsais/Makefile
+++ b/ccs/ccsais/Makefile
@@ -41,3 +41,5 @@ depends:

clean: generalclean
rm -f logging.c
+
+-include $(OBJS:.o=.d)
diff --git a/ccs/daemon/Makefile b/ccs/daemon/Makefile
index f1bdb35..c4a862d 100644
--- a/ccs/daemon/Makefile
+++ b/ccs/daemon/Makefile
@@ -46,3 +46,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/ccs/lib/Makefile b/ccs/lib/Makefile
index cfcbb2a..63d32f0 100644
--- a/ccs/lib/Makefile
+++ b/ccs/lib/Makefile
@@ -41,3 +41,5 @@ log.c:

clean: generalclean
rm -rf ccs.h.gch log.c
+
+-include $(OBJS:.o=.d)
diff --git a/ccs/lib/libccs.c b/ccs/lib/libccs.c
index 2b9f179..3c1c451 100644
--- a/ccs/lib/libccs.c
+++ b/ccs/lib/libccs.c
@@ -24,6 +24,7 @@
#include "log.h" /* Libraries should not print - so only use log_dbg */
#include "debug.h"
#include "comm_headers.h"
+#include "ccs.h"

#include <stdio.h>

diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile
index 48f8cec..dc6f8cf 100644
--- a/cman/cman_tool/Makefile
+++ b/cman/cman_tool/Makefile
@@ -39,3 +39,5 @@ depends:
$(MAKE) -C ../lib all

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/cman/daemon/Makefile b/cman/daemon/Makefile
index ff3be15..f139d71 100644
--- a/cman/daemon/Makefile
+++ b/cman/daemon/Makefile
@@ -48,3 +48,5 @@ depends:

clean: generalclean

+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
diff --git a/cman/lib/Makefile b/cman/lib/Makefile
index fbc4a28..13c6f6e 100644
--- a/cman/lib/Makefile
+++ b/cman/lib/Makefile
@@ -33,17 +33,21 @@ include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

+OBJS= $(TARGET).o
+
CFLAGS += -fPIC
CFLAGS += -I${cmanincdir} -I$(S)/../daemon
CFLAGS += -I${incdir}

-$(TARGET).a: $(TARGET).o
+$(TARGET).a: $(OBJS)
${AR} r $@ $^
${RANLIB} $@

-$(TARGET).so.${SOMAJOR}.${SOMINOR}: $(TARGET).o
+$(TARGET).so.${SOMAJOR}.${SOMINOR}: $(OBJS)
$(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $<
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/cman/qdisk/Makefile b/cman/qdisk/Makefile
index 4d3634d..0751601 100644
--- a/cman/qdisk/Makefile
+++ b/cman/qdisk/Makefile
@@ -58,3 +58,7 @@ depends:
$(MAKE) -C ../lib all

clean: generalclean
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(SHAREDOBJS:.o=.d)
diff --git a/configure b/configure
index 21e9dbc..d2db93e 100755
--- a/configure
+++ b/configure
@@ -318,7 +318,7 @@ if (!$cc) {
$cc="gcc";
}
if (!$cflags) {
- $cflags="-Wall -Wformat=2";
+ $cflags="-Wall -Wformat=2 -MMD";
if (!$debug) {
$cflags="${cflags} -O2";
} else {
diff --git a/dlm/lib/Makefile b/dlm/lib/Makefile
index b223df7..d164ec9 100644
--- a/dlm/lib/Makefile
+++ b/dlm/lib/Makefile
@@ -78,3 +78,7 @@ $(TARGET)_lt.so.${SOMAJOR}.${SOMINOR}: $(TARGET)_lt.po
$(CC) $(CFLAGS) -fPIC -D_REENTRANT -c -o $@ $<

clean: generalclean
+
+-include $(TARGET).d
+-include $(TARGET)_lt.d
+-include $(AISTARGET).d
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index 59d4602..7a082dc 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -35,3 +35,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/fence/agents/ipmilan/Makefile b/fence/agents/ipmilan/Makefile
index 1320d61..78674e5 100644
--- a/fence/agents/ipmilan/Makefile
+++ b/fence/agents/ipmilan/Makefile
@@ -33,3 +33,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/fence/agents/rackswitch/Makefile b/fence/agents/rackswitch/Makefile
index 6a53d6c..01c2b41 100644
--- a/fence/agents/rackswitch/Makefile
+++ b/fence/agents/rackswitch/Makefile
@@ -32,3 +32,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/fence/agents/rps10/Makefile b/fence/agents/rps10/Makefile
index 26c917e..3057ded 100644
--- a/fence/agents/rps10/Makefile
+++ b/fence/agents/rps10/Makefile
@@ -34,3 +34,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile
index 98777b6..c60f44a 100644
--- a/fence/agents/xvm/Makefile
+++ b/fence/agents/xvm/Makefile
@@ -68,3 +68,8 @@ ${TARGET3}: ${OBJS3}
$(CC) -o $@ $^ $(XML_LDFLAGS)

clean: generalclean
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(OBJS3:.o=.d)
+-include $(SHAREDOBJS:.o=.d)
diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile
index a73b729..3ac1092 100644
--- a/fence/fence_node/Makefile
+++ b/fence/fence_node/Makefile
@@ -41,3 +41,5 @@ depends:
$(MAKE) -C ../fenced agent.o

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/fence/fence_tool/Makefile b/fence/fence_tool/Makefile
index 7d59b4b..0c56ed2 100644
--- a/fence/fence_tool/Makefile
+++ b/fence/fence_tool/Makefile
@@ -41,3 +41,5 @@ depends:
$(MAKE) -C ../fenced agent.o

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile
index 66da72e..e9e0f54 100644
--- a/fence/fenced/Makefile
+++ b/fence/fenced/Makefile
@@ -42,3 +42,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_debug/Makefile b/gfs/gfs_debug/Makefile
index dd9e91c..67355ed 100644
--- a/gfs/gfs_debug/Makefile
+++ b/gfs/gfs_debug/Makefile
@@ -40,3 +40,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_edit/Makefile b/gfs/gfs_edit/Makefile
index 180c64e..5b24da7 100644
--- a/gfs/gfs_edit/Makefile
+++ b/gfs/gfs_edit/Makefile
@@ -38,3 +38,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_fsck/Makefile b/gfs/gfs_fsck/Makefile
index 6afec81..3c2e299 100644
--- a/gfs/gfs_fsck/Makefile
+++ b/gfs/gfs_fsck/Makefile
@@ -56,7 +56,6 @@ OBJS= bio.o
util.o

CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-CFLAGS += -MMD
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}

@@ -79,6 +78,6 @@ clean: generalclean
${TARGET1}.pot: $(OBJS:.o=.c)
xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_
--keyword=log_notice --keyword=log_warn --keyword=log_err --keyword=log_crit
- --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET1}.pot
+ --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET1}.pot

-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_grow/Makefile b/gfs/gfs_grow/Makefile
index 59ac438..d3b59d6 100644
--- a/gfs/gfs_grow/Makefile
+++ b/gfs/gfs_grow/Makefile
@@ -43,3 +43,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_jadd/Makefile b/gfs/gfs_jadd/Makefile
index 2d62842..36dfd9f 100644
--- a/gfs/gfs_jadd/Makefile
+++ b/gfs/gfs_jadd/Makefile
@@ -43,3 +43,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_mkfs/Makefile b/gfs/gfs_mkfs/Makefile
index 51a1cb9..ec9ea8f 100644
--- a/gfs/gfs_mkfs/Makefile
+++ b/gfs/gfs_mkfs/Makefile
@@ -53,3 +53,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET1}
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_quota/Makefile b/gfs/gfs_quota/Makefile
index 57dd177..434ddc5 100644
--- a/gfs/gfs_quota/Makefile
+++ b/gfs/gfs_quota/Makefile
@@ -39,3 +39,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/gfs_tool/Makefile b/gfs/gfs_tool/Makefile
index 7feb799..766009a 100644
--- a/gfs/gfs_tool/Makefile
+++ b/gfs/gfs_tool/Makefile
@@ -43,3 +43,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/libgfs/Makefile b/gfs/libgfs/Makefile
index bd69517..4195226 100644
--- a/gfs/libgfs/Makefile
+++ b/gfs/libgfs/Makefile
@@ -52,3 +52,5 @@ ${TARGET}: ${OBJS}
clean: generalclean

.PHONY: all
+
+-include $(OBJS:.o=.d)
diff --git a/gfs/tests/filecon2/Makefile b/gfs/tests/filecon2/Makefile
index 8627b81..4e365d1 100644
--- a/gfs/tests/filecon2/Makefile
+++ b/gfs/tests/filecon2/Makefile
@@ -11,14 +11,14 @@
################################################## #############################
################################################## #############################

+TARGETS= filecon2_server filecon2_client
+
all: $(TARGETS)

include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk

-TARGETS= filecon2_server filecon2_client
-
CFLAGS += -O3
CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS += -I../../include
diff --git a/gfs/tests/mmdd/Makefile b/gfs/tests/mmdd/Makefile
index ae1a3e0..da1585c 100644
--- a/gfs/tests/mmdd/Makefile
+++ b/gfs/tests/mmdd/Makefile
@@ -11,16 +11,15 @@
################################################## #############################
################################################## #############################

+TARGETS= mmdd sfdd
+
all: $(TARGETS)

include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk

-TARGETS= mmdd sfdd
-
CFLAGS += -D_GNU_SOURCE

-
mmdd.o: mmdd.c
$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $<

@@ -31,3 +30,6 @@ sfdd.o: mmdd.c
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include mmdd.d
+-include sfdd.d
diff --git a/gfs2/convert/Makefile b/gfs2/convert/Makefile
index 231588a..f82f2a4 100755
--- a/gfs2/convert/Makefile
+++ b/gfs2/convert/Makefile
@@ -41,3 +41,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/gfs2/edit/Makefile b/gfs2/edit/Makefile
index 655b8b4..0b84dd3 100644
--- a/gfs2/edit/Makefile
+++ b/gfs2/edit/Makefile
@@ -46,3 +46,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/gfs2/fsck/Makefile b/gfs2/fsck/Makefile
index 5726a9f..26cb0a1 100644
--- a/gfs2/fsck/Makefile
+++ b/gfs2/fsck/Makefile
@@ -44,7 +44,6 @@ OBJS= eattr.o
util.o

CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM
-CFLAGS += -MMD
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I$(S)/../include -I$(S)/../libgfs2
CFLAGS += -I${incdir}
diff --git a/gfs2/libgfs2/Makefile b/gfs2/libgfs2/Makefile
index fb049a9..d6bbcef 100644
--- a/gfs2/libgfs2/Makefile
+++ b/gfs2/libgfs2/Makefile
@@ -51,3 +51,6 @@ ${TARGET}: ${OBJS}
clean: generalclean

.PHONY: all
+
+-include $(OBJS:.o=.d)
+
diff --git a/gfs2/mkfs/Makefile b/gfs2/mkfs/Makefile
index ffd97e5..8b11478 100644
--- a/gfs2/mkfs/Makefile
+++ b/gfs2/mkfs/Makefile
@@ -51,3 +51,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET1}
+
+-include $(OBJS:.o=.d)
diff --git a/gfs2/mount/Makefile b/gfs2/mount/Makefile
index 92c04c5..3b01f04 100644
--- a/gfs2/mount/Makefile
+++ b/gfs2/mount/Makefile
@@ -48,3 +48,7 @@ uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${DESTDIR}/sbin

clean: generalclean
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(SHAREDOBJS:.o=.d)
diff --git a/gfs2/quota/Makefile b/gfs2/quota/Makefile
index abe0c9d..2075ad9 100644
--- a/gfs2/quota/Makefile
+++ b/gfs2/quota/Makefile
@@ -44,3 +44,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/gfs2/tool/Makefile b/gfs2/tool/Makefile
index effcfa9..a70fac9 100644
--- a/gfs2/tool/Makefile
+++ b/gfs2/tool/Makefile
@@ -49,3 +49,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/gnbd/client/Makefile b/gnbd/client/Makefile
index b78a43e..f4437f7 100644
--- a/gnbd/client/Makefile
+++ b/gnbd/client/Makefile
@@ -49,3 +49,7 @@ depends:
$(MAKE) -C ../utils all

clean: generalclean
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(SHAREDOBJS:.o=.d)
diff --git a/gnbd/server/Makefile b/gnbd/server/Makefile
index fa29cdd..3036e85 100644
--- a/gnbd/server/Makefile
+++ b/gnbd/server/Makefile
@@ -54,3 +54,7 @@ depends:
$(MAKE) -C ../utils all

clean: generalclean
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(SHAREDOBJS:.o=.d)
diff --git a/gnbd/tools/fence_gnbd/Makefile b/gnbd/tools/fence_gnbd/Makefile
index 2976bbc..29367c5 100644
--- a/gnbd/tools/fence_gnbd/Makefile
+++ b/gnbd/tools/fence_gnbd/Makefile
@@ -33,3 +33,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gnbd/tools/gnbd_export/Makefile b/gnbd/tools/gnbd_export/Makefile
index 8fede39..ebd0de0 100644
--- a/gnbd/tools/gnbd_export/Makefile
+++ b/gnbd/tools/gnbd_export/Makefile
@@ -44,3 +44,5 @@ depends:
$(MAKE) -C ../../utils all

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gnbd/tools/gnbd_import/Makefile b/gnbd/tools/gnbd_import/Makefile
index fb63596..fbcfa73 100644
--- a/gnbd/tools/gnbd_import/Makefile
+++ b/gnbd/tools/gnbd_import/Makefile
@@ -43,3 +43,5 @@ depends:
$(MAKE) -C ../../client monitor_req.o

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/gnbd/utils/Makefile b/gnbd/utils/Makefile
index c72dd83..354d720 100644
--- a/gnbd/utils/Makefile
+++ b/gnbd/utils/Makefile
@@ -11,11 +11,11 @@
################################################## #############################
################################################## #############################

-TARGETS=member_cman.o
+OBJS= member_cman.o
trans.o
gnbd_utils.o

-all: ${TARGETS}
+all: ${OBJS}

include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -27,3 +27,5 @@ CFLAGS += -I${cmanincdir}
CFLAGS += -I$(S)/../include

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/group/daemon/Makefile b/group/daemon/Makefile
index 33f76af..90f199b 100644
--- a/group/daemon/Makefile
+++ b/group/daemon/Makefile
@@ -39,3 +39,5 @@ ${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 5887051..9f26a14 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -47,3 +47,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile
index 40db5a5..2b05312 100644
--- a/group/gfs_controld/Makefile
+++ b/group/gfs_controld/Makefile
@@ -49,3 +49,5 @@ depends:
clean: generalclean

.PHONY: all ${TARGET}
+
+-include $(OBJS:.o=.d)
diff --git a/group/lib/Makefile b/group/lib/Makefile
index 051164c..25ae3c8 100644
--- a/group/lib/Makefile
+++ b/group/lib/Makefile
@@ -24,9 +24,12 @@ CFLAGS += -fPIC
CFLAGS += -I$(S) -I$(S)/../daemon
CFLAGS += -I${incdir}

+OBJS= $(TARGET).o

-$(TARGET).a: $(TARGET).o
+$(TARGET).a: $(OBJS)
${AR} r $@ $^
${RANLIB} $@

clean: generalclean
+
+-include $(OBJS:.o=.d)
diff --git a/rgmanager/src/clulib/Makefile b/rgmanager/src/clulib/Makefile
index 7c005dd..c13edd8 100644
--- a/rgmanager/src/clulib/Makefile
+++ b/rgmanager/src/clulib/Makefile
@@ -53,3 +53,7 @@ ${TARGET3}: ${OBJS3} ${TARGET1}
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(OBJS3:.o=.d)
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 62904f9..e9297b1 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -123,3 +123,9 @@ clean: generalclean
rm -f tests/*.out*

.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(OBJS3:.o=.d)
+-include $(OBJS4:.o=.d)
+-include $(SHAREDOBJS:.o=.d)
diff --git a/rgmanager/src/utils/Makefile b/rgmanager/src/utils/Makefile
index e13f8dc..61e22bc 100644
--- a/rgmanager/src/utils/Makefile
+++ b/rgmanager/src/utils/Makefile
@@ -42,21 +42,26 @@ CMAN_LDFLAGS += -L${cmanlibdir} -lcman
NCURSES_LDFLAGS += -L${ncurseslibdir} -lncurses
PTHREAD_LDFLAGS += -lpthread

+OBJS1= $(TARGET1).o
+OBJS2= $(TARGET2).o
+OBJS3= $(TARGET3).o
+OBJS4= $(TARGET4).o
+OBJS5= $(TARGET5).o

-${TARGET1}: ${TARGET1:=.o}
+${TARGET1}: ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)

-${TARGET2}: ${TARGET2:=.o}
+${TARGET2}: ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)

-${TARGET3}: ${TARGET3:=.o}
+${TARGET3}: ${OBJS3}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS)
$(NCURSES_LDFLAGS) $(PTHREAD_LDFLAGS)

-${TARGET4}: ${TARGET4:=.o}
+${TARGET4}: ${OBJS4}
$(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) $(PTHREAD_LDFLAGS)

-${TARGET5}: ${TARGET5:=.o}
+${TARGET5}: ${OBJS5}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS)

${TARGET6}:
@@ -69,3 +74,9 @@ depends:
clean: generalclean

.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
+
+-include $(OBJS1:.o=.d)
+-include $(OBJS2:.o=.d)
+-include $(OBJS3:.o=.d)
+-include $(OBJS4:.o=.d)
+-include $(OBJS5:.o=.d)


hooks/post-receive
--
Cluster Project
 

Thread Tools




All times are GMT. The time now is 05:10 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org