* [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
@ 2007-05-03 16:56 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-05-03 16:56 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-05-03 16:55:59
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
dlm/lib : Makefile
fence/agents/ipmilan: Makefile
fence/agents/manual: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/libgfs : Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
group/daemon : Makefile
group/lib : Makefile
group/test : Makefile
group/tool : Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
Log message:
Fix build system. Thanks to Alasdair for spotting the error
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.48&r2=1.49
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/test/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
--- cluster/ccs/ccs_test/Makefile 2007/04/30 11:21:59 1.4
+++ cluster/ccs/ccs_test/Makefile 2007/05/03 16:55:49 1.5
@@ -33,7 +33,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
install -d ${sbindir}
--- cluster/ccs/ccs_tool/Makefile 2007/04/30 11:21:59 1.9
+++ cluster/ccs/ccs_tool/Makefile 2007/05/03 16:55:49 1.10
@@ -40,7 +40,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f *.o ccs_tool *~
--- cluster/ccs/daemon/Makefile 2007/05/02 12:41:50 1.11
+++ cluster/ccs/daemon/Makefile 2007/05/03 16:55:50 1.12
@@ -40,7 +40,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
install -d ${sbindir}
--- cluster/ccs/lib/Makefile 2007/04/30 11:21:59 1.5
+++ cluster/ccs/lib/Makefile 2007/05/03 16:55:51 1.6
@@ -33,7 +33,7 @@
${AR} cr ${TARGET} ${OBJS}
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
log.c:
ln -sf ../common/log.c log.c
--- cluster/cman/cman_tool/Makefile 2007/04/30 11:22:00 1.19
+++ cluster/cman/cman_tool/Makefile 2007/05/03 16:55:51 1.20
@@ -35,7 +35,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
install -d ${sbindir}
--- cluster/cman/daemon/Makefile 2007/04/30 11:22:00 1.48
+++ cluster/cman/daemon/Makefile 2007/05/03 16:55:52 1.49
@@ -41,7 +41,7 @@
$(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
install -d ${libexecdir}/lcrso
--- cluster/cman/lib/Makefile 2007/04/30 11:22:01 1.8
+++ cluster/cman/lib/Makefile 2007/05/03 16:55:52 1.9
@@ -28,7 +28,7 @@
${RANLIB} $@
$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}: $(TARGET).o
- $(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(RELEASE_MAJOR) $^
+ $(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(RELEASE_MAJOR) $<
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so.$(RELEASE_MAJOR)
--- cluster/cman/qdisk/Makefile 2007/04/30 11:22:02 1.8
+++ cluster/cman/qdisk/Makefile 2007/05/03 16:55:52 1.9
@@ -50,7 +50,7 @@
install ${TARGET1} ${TARGET2} ${sbindir}
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f *.o ${TARGET1} ${TARGET2}
--- cluster/dlm/lib/Makefile 2007/04/30 11:22:05 1.18
+++ cluster/dlm/lib/Makefile 2007/05/03 16:55:52 1.19
@@ -35,12 +35,12 @@
${RANLIB} $@
$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}: $(TARGET).po $(AISTARGET).po
- $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET).so.$(RELEASE_MAJOR) $^
+ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET).so.$(RELEASE_MAJOR) $<
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so.$(RELEASE_MAJOR)
$(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}: $(TARGET)_lt.po
- $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET)_lt.so.$(RELEASE_MAJOR) $^
+ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET)_lt.so.$(RELEASE_MAJOR) $<
ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET)_lt.so
ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET)_lt.so.$(RELEASE_MAJOR)
--- cluster/fence/agents/ipmilan/Makefile 2007/04/30 11:22:08 1.4
+++ cluster/fence/agents/ipmilan/Makefile 2007/05/03 16:55:52 1.5
@@ -26,7 +26,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/agents/manual/Makefile 2007/04/30 11:22:08 1.10
+++ cluster/fence/agents/manual/Makefile 2007/05/03 16:55:52 1.11
@@ -21,7 +21,7 @@
# (this version does not require any configuration params
# in cluster.conf, but fencing must fail first)
fence_ack_manual: fence_ack_manual.sh
- cp $^ $@
+ cp $< $@
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/agents/rackswitch/Makefile 2007/05/02 12:39:33 1.3
+++ cluster/fence/agents/rackswitch/Makefile 2007/05/03 16:55:52 1.4
@@ -27,7 +27,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/agents/rps10/Makefile 2007/04/30 11:22:08 1.3
+++ cluster/fence/agents/rps10/Makefile 2007/05/03 16:55:53 1.4
@@ -25,7 +25,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/agents/xvm/Makefile 2007/04/30 11:22:10 1.6
+++ cluster/fence/agents/xvm/Makefile 2007/05/03 16:55:53 1.7
@@ -50,7 +50,7 @@
$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f ${TARGET1} ${TARGET2} *~ *.o
--- cluster/fence/fence_node/Makefile 2007/04/30 11:22:11 1.6
+++ cluster/fence/fence_node/Makefile 2007/05/03 16:55:54 1.7
@@ -37,7 +37,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/fence_tool/Makefile 2007/04/30 11:22:11 1.13
+++ cluster/fence/fence_tool/Makefile 2007/05/03 16:55:54 1.14
@@ -37,7 +37,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/fenced/Makefile 2007/04/30 11:22:11 1.8
+++ cluster/fence/fenced/Makefile 2007/05/03 16:55:54 1.9
@@ -35,7 +35,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_debug/Makefile 2007/04/30 11:22:12 1.6
+++ cluster/gfs/gfs_debug/Makefile 2007/05/03 16:55:54 1.7
@@ -33,7 +33,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_edit/Makefile 2007/04/30 11:22:12 1.7
+++ cluster/gfs/gfs_edit/Makefile 2007/05/03 16:55:54 1.8
@@ -30,7 +30,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_fsck/Makefile 2007/04/30 11:22:12 1.8
+++ cluster/gfs/gfs_fsck/Makefile 2007/05/03 16:55:54 1.9
@@ -31,7 +31,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
test_block_list: block_list.o bitmap.o log.o test_block_list.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_grow/Makefile 2007/04/30 11:22:12 1.7
+++ cluster/gfs/gfs_grow/Makefile 2007/05/03 16:55:54 1.8
@@ -30,7 +30,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_jadd/Makefile 2007/04/30 11:22:13 1.7
+++ cluster/gfs/gfs_jadd/Makefile 2007/05/03 16:55:55 1.8
@@ -30,7 +30,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_mkfs/Makefile 2007/04/30 11:22:13 1.7
+++ cluster/gfs/gfs_mkfs/Makefile 2007/05/03 16:55:55 1.8
@@ -36,7 +36,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_quota/Makefile 2007/04/30 11:22:13 1.7
+++ cluster/gfs/gfs_quota/Makefile 2007/05/03 16:55:55 1.8
@@ -32,7 +32,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_tool/Makefile 2007/04/30 11:22:13 1.10
+++ cluster/gfs/gfs_tool/Makefile 2007/05/03 16:55:55 1.11
@@ -36,7 +36,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/libgfs/Makefile 2007/04/30 11:22:14 1.4
+++ cluster/gfs/libgfs/Makefile 2007/05/03 16:55:55 1.5
@@ -33,7 +33,7 @@
ranlib libgfs.a
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
--- cluster/gfs2/convert/Makefile 2007/04/30 11:22:16 1.6
+++ cluster/gfs2/convert/Makefile 2007/05/03 16:55:55 1.7
@@ -29,7 +29,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs2/edit/Makefile 2007/04/30 11:22:16 1.5
+++ cluster/gfs2/edit/Makefile 2007/05/03 16:55:55 1.6
@@ -32,7 +32,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs2/fsck/Makefile 2007/05/01 16:43:38 1.9
+++ cluster/gfs2/fsck/Makefile 2007/05/03 16:55:55 1.10
@@ -33,7 +33,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
test_block_list: log.o test_block_list.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/libgfs2/Makefile 2007/04/30 11:22:16 1.5
+++ cluster/gfs2/libgfs2/Makefile 2007/05/03 16:55:56 1.6
@@ -47,7 +47,7 @@
ranlib libgfs2.a
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
--- cluster/gfs2/mkfs/Makefile 2007/04/30 11:22:16 1.14
+++ cluster/gfs2/mkfs/Makefile 2007/05/03 16:55:56 1.15
@@ -30,7 +30,7 @@
ln -s ${TARGET1} ${TARGET2}
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
install -m 0755 ${TARGET1} ${sbindir}
--- cluster/gfs2/mount/Makefile 2007/04/30 11:22:17 1.12
+++ cluster/gfs2/mount/Makefile 2007/05/03 16:55:56 1.13
@@ -38,7 +38,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
install ${TARGET1} ${sbindir}
--- cluster/gfs2/quota/Makefile 2007/04/30 11:22:17 1.7
+++ cluster/gfs2/quota/Makefile 2007/05/03 16:55:56 1.8
@@ -32,7 +32,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
install -m 0755 ${TARGET} ${sbindir}
--- cluster/gfs2/tool/Makefile 2007/04/30 11:22:17 1.6
+++ cluster/gfs2/tool/Makefile 2007/05/03 16:55:56 1.7
@@ -37,7 +37,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gnbd/client/Makefile 2007/04/30 11:22:18 1.11
+++ cluster/gnbd/client/Makefile 2007/05/03 16:55:56 1.12
@@ -41,7 +41,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gnbd/server/Makefile 2007/04/30 11:22:18 1.11
+++ cluster/gnbd/server/Makefile 2007/05/03 16:55:56 1.12
@@ -46,7 +46,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/04/30 11:22:19 1.3
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/05/03 16:55:57 1.4
@@ -26,7 +26,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/04/30 11:22:19 1.12
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/05/03 16:55:57 1.13
@@ -32,7 +32,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/04/30 11:22:19 1.9
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/05/03 16:55:57 1.10
@@ -33,7 +33,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/group/daemon/Makefile 2007/04/30 11:22:20 1.17
+++ cluster/group/daemon/Makefile 2007/05/03 16:55:57 1.18
@@ -32,7 +32,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f *.o groupd
--- cluster/group/lib/Makefile 2007/04/30 11:22:20 1.4
+++ cluster/group/lib/Makefile 2007/05/03 16:55:58 1.5
@@ -25,7 +25,7 @@
# ${RANLIB} $(TARGET).a
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
install: all
--- cluster/group/test/Makefile 2005/04/19 07:00:42 1.1
+++ cluster/group/test/Makefile 2007/05/03 16:55:58 1.2
@@ -15,10 +15,10 @@
all: client clientd
client: client.o
- $(CC) $(LDFLAGS) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $<
clientd: clientd.o
- $(CC) $(LDFLAGS) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $<
client.o: client.c
$(CC) $(CFLAGS) -c -o $@ $<
--- cluster/group/tool/Makefile 2007/04/30 11:22:21 1.7
+++ cluster/group/tool/Makefile 2007/05/03 16:55:59 1.8
@@ -26,7 +26,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f *.o ${TARGET}
--- cluster/rgmanager/src/clulib/Makefile 2007/04/30 11:22:23 1.13
+++ cluster/rgmanager/src/clulib/Makefile 2007/05/03 16:55:59 1.14
@@ -52,7 +52,7 @@
$(CC) -o $@ $^ $(LDFLAGS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
clean:
rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3}
--- cluster/rgmanager/src/daemons/Makefile 2007/04/30 11:22:23 1.19
+++ cluster/rgmanager/src/daemons/Makefile 2007/05/03 16:55:59 1.20
@@ -102,10 +102,10 @@
cd tests && ./runtests.sh
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) -c -o $@ $<
%-noccs.o: %.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $^
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
install: all
install -d ${sbindir}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
@ 2007-05-15 14:37 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-05-15 14:37 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-05-15 14:37:37
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/man : Makefile
cman/qdisk : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/libgfs : Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/tool : Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/utils: Makefile
Log message:
Rrestore the make dependencies within the same subproject (same as it
was before the big rework), do some PHONY clean up, clean up a few Makefiles
that were still using an old format.
Patch ACK by Lon and Patrick on IRC.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.49&r2=1.50
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/man/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
--- cluster/ccs/ccs_test/Makefile 2007/05/03 16:55:49 1.5
+++ cluster/ccs/ccs_test/Makefile 2007/05/15 14:37:29 1.6
@@ -27,7 +27,7 @@
LDFLAGS += -L${ccslibdir} -lccs
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -35,6 +35,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
install: all
install -d ${sbindir}
install ${TARGET} ${sbindir}
@@ -44,3 +47,5 @@
clean:
rm -rf *.o ${TARGET} *~
+
+.PHONY: all ${TARGET}
--- cluster/ccs/ccs_tool/Makefile 2007/05/03 16:55:49 1.10
+++ cluster/ccs/ccs_tool/Makefile 2007/05/15 14:37:29 1.11
@@ -34,7 +34,7 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += `xml2-config --libs` -L${libdir} -ldl
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -42,6 +42,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
clean:
rm -f *.o ccs_tool *~
@@ -51,3 +54,5 @@
uninstall:
${UNINSTALL} ccs_tool ${sbindir}
+
+.PHONY: all ${TARGET}
--- cluster/ccs/daemon/Makefile 2007/05/03 16:55:50 1.12
+++ cluster/ccs/daemon/Makefile 2007/05/15 14:37:29 1.13
@@ -34,7 +34,7 @@
LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread -ldl
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -42,6 +42,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
install: all
install -d ${sbindir}
install ${TARGET} ${sbindir}
@@ -51,3 +54,5 @@
clean:
rm -rf *.o ${TARGET} *~ log.c
+
+.PHONY: all ${TARGET}
--- cluster/cman/cman_tool/Makefile 2007/05/03 16:55:51 1.20
+++ cluster/cman/cman_tool/Makefile 2007/05/15 14:37:30 1.21
@@ -29,7 +29,7 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -37,6 +37,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
install: all
install -d ${sbindir}
install ${TARGET} ${sbindir}
@@ -46,4 +49,3 @@
clean:
rm -f *.o ${TARGET}
-
--- cluster/cman/daemon/Makefile 2007/05/03 16:55:52 1.49
+++ cluster/cman/daemon/Makefile 2007/05/15 14:37:30 1.50
@@ -35,7 +35,7 @@
barrier.o \
cmanccs.o
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
@@ -43,6 +43,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
install: all
install -d ${libexecdir}/lcrso
install -s ${TARGET} ${libexecdir}/lcrso
--- cluster/cman/man/Makefile 2007/04/30 11:22:01 1.3
+++ cluster/cman/man/Makefile 2007/05/15 14:37:30 1.4
@@ -17,8 +17,6 @@
clean:
-distclean:
-
install:
install -d ${mandir}/man5
install -d ${mandir}/man8
--- cluster/cman/qdisk/Makefile 2007/05/03 16:55:52 1.9
+++ cluster/cman/qdisk/Makefile 2007/05/15 14:37:30 1.10
@@ -37,7 +37,7 @@
disk_util.o \
proc.o
-all: ${TARGET1} ${TARGET2}
+all: depends ${TARGET1} ${TARGET2}
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
@@ -52,6 +52,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
clean:
rm -f *.o ${TARGET1} ${TARGET2}
--- cluster/gfs/gfs_fsck/Makefile 2007/05/03 16:55:54 1.9
+++ cluster/gfs/gfs_fsck/Makefile 2007/05/15 14:37:30 1.10
@@ -12,24 +12,52 @@
include ../../make/defines.mk
-TARGET= gfs_fsck
+TARGET1= gfs_fsck
+TARGET2= fsck.gfs
-sources = main.c initialize.c pass1.c pass1b.c pass1c.c \
- pass2.c pass3.c pass4.c pass5.c \
- block_list.c super.c bio.c ondisk.c file.c rgrp.c fs_bits.c util.c \
- fs_bmap.c fs_inode.c fs_dir.c fs_recovery.c log.c hash.c \
- inode_hash.c bitmap.c lost_n_found.c inode.c link.c metawalk.c \
- eattr.c
+OBJS= bio.o \
+ bitmap.o \
+ block_list.o \
+ eattr.o \
+ file.o \
+ fs_bits.o \
+ fs_bmap.o \
+ fs_dir.o \
+ fs_inode.o \
+ fs_recovery.o \
+ hash.o \
+ initialize.o \
+ inode.o \
+ inode_hash.o \
+ link.o \
+ log.o \
+ lost_n_found.o \
+ main.o \
+ metawalk.o \
+ ondisk.o \
+ pass1.o \
+ pass1b.o \
+ pass1c.o \
+ pass2.o \
+ pass3.o \
+ pass4.o \
+ pass5.o \
+ rgrp.o \
+ super.o \
+ util.o
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -MMD -O2
CFLAGS += -I../include
-all: ${TARGET}
+all: ${TARGET1} ${TARGET2}
-${TARGET}: $(sources:.c=.o)
+${TARGET1}: $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS)
+${TARGET2}: ${TARGET1}
+ ln -s ${TARGET1} ${TARGET2}
+
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
@@ -40,24 +68,21 @@
$(CC) -o $@ $^ $(LDFLAGS)
clean:
- @rm -f *.o *~ *.d gfs_fsck
+ rm -f *.o *~ *.d ${TARGET1} ${TARGET2} cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
fi
- install -m755 ${TARGET} ${sbindir}
- (cd ${sbindir}; ln -sf ${TARGET} fsck.gfs)
+ install -m755 ${TARGET1} ${sbindir}
+ ln -sf ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
uninstall:
- ${UNINSTALL} ${TARGET} fsck.gfs ${sbindir}
-
-distclean: clean
- @rm -f cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
+ ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-gfs_fsck.pot: $(sources)
- @xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_ \
+${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 - $(sources) > gfs_fsck.pot
+ --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET1}.pot
--include $(sources:.c=.d)
+-include $(OBJS:.o=.d)
--- cluster/gfs/gfs_grow/Makefile 2007/05/03 16:55:54 1.8
+++ cluster/gfs/gfs_grow/Makefile 2007/05/15 14:37:31 1.9
@@ -24,7 +24,7 @@
LDFLAGS += -L../libgfs -lgfs
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -32,6 +32,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs all
+
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
@@ -43,3 +46,5 @@
clean:
rm -f *.o ${TARGET}
+
+.PHONY: all ${TARGET}
--- cluster/gfs/gfs_jadd/Makefile 2007/05/03 16:55:55 1.8
+++ cluster/gfs/gfs_jadd/Makefile 2007/05/15 14:37:32 1.9
@@ -24,7 +24,7 @@
LDFLAGS += -L../libgfs -lgfs
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -32,6 +32,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs all
+
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
@@ -44,4 +47,4 @@
clean:
rm -f *.o ${TARGET}
-
+.PHONY: all ${TARGET}
--- cluster/gfs/gfs_mkfs/Makefile 2007/05/03 16:55:55 1.8
+++ cluster/gfs/gfs_mkfs/Makefile 2007/05/15 14:37:32 1.9
@@ -13,7 +13,8 @@
include ../../make/defines.mk
-TARGET= gfs_mkfs
+TARGET1= gfs_mkfs
+TARGET2= mkfs.gfs
OBJS= device_geometry.o \
fs_geometry.o \
@@ -30,25 +31,31 @@
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs -lgfs
-all: ${TARGET}
+all: depends ${TARGET1} ${TARGET2}
-${TARGET}: ${OBJS}
+${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
+${TARGET2}: ${TARGET1}
+ ln -sf ${TARGET1} ${TARGET2}
+
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs all
+
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
fi
- install -m755 ${TARGET} ${sbindir}
- (cd ${sbindir}; ln -f ${TARGET} mkfs.gfs)
+ install -m755 ${TARGET1} ${sbindir}
+ ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
uninstall:
- ${UNINSTALL} ${TARGET} mkfs.gfs ${sbindir}
+ ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
clean:
- rm -f *.o ${TARGET}
-
+ rm -f *.o ${TARGET1} ${TARGET2}
+.PHONY: all ${TARGET1}
--- cluster/gfs/libgfs/Makefile 2007/05/03 16:55:55 1.5
+++ cluster/gfs/libgfs/Makefile 2007/05/15 14:37:32 1.6
@@ -11,11 +11,9 @@
###############################################################################
###############################################################################
-.PHONY: all clean install
-
include ../../make/defines.mk
-LIBGFS=libgfs.a
+TARGET=libgfs.a
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I${gfskincdir} -I../include
@@ -23,12 +21,25 @@
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -c -Wall -ggdb
-OBJS=bio.o bitmap.o block_list.o file.o fs_bits.o fs_bmap.o fs_dir.o \
- fs_inode.o inode.o log.o ondisk.o rgrp.o size.o super.o util.o
+OBJS= bio.o \
+ bitmap.o \
+ block_list.o \
+ file.o \
+ fs_bits.o \
+ fs_bmap.o \
+ fs_dir.o \
+ fs_inode.o \
+ inode.o \
+ log.o \
+ ondisk.o \
+ rgrp.o \
+ size.o \
+ super.o \
+ util.o
-all: ${LIBGFS}
+all: ${TARGET}
-${LIBGFS}: ${OBJS}
+${TARGET}: ${OBJS}
ar cru libgfs.a ${OBJS}
ranlib libgfs.a
@@ -40,4 +51,6 @@
uninstall:
clean:
- rm -f *.o ${LIBGFS}
+ rm -f *.o ${TARGET}
+
+.PHONY: all
--- cluster/gfs2/convert/Makefile 2007/05/03 16:55:55 1.7
+++ cluster/gfs2/convert/Makefile 2007/05/15 14:37:32 1.8
@@ -23,7 +23,7 @@
LDFLAGS += -L../libgfs2 -lgfs2
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -31,6 +31,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs2 all
+
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
@@ -41,7 +44,6 @@
${UNINSTALL} ${TARGET} ${sbindir}
clean:
- @rm -f *.o ${TARGET}
+ rm -f *.o ${TARGET}
-distclean: clean
- @rm -f {top_srcdir}/make/defines.mk
+.PHONY: all ${TARGET}
--- cluster/gfs2/edit/Makefile 2007/05/03 16:55:55 1.6
+++ cluster/gfs2/edit/Makefile 2007/05/15 14:37:32 1.7
@@ -26,7 +26,7 @@
LDFLAGS += -L${ncurseslibdir} -lncurses
LDFLAGS += -L../libgfs2/ -lgfs2
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -34,6 +34,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs2 all
+
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
@@ -46,4 +49,4 @@
clean:
rm -f *.o ${TARGET}
-
+.PHONY: all ${TARGET}
--- cluster/gfs2/fsck/Makefile 2007/05/03 16:55:55 1.10
+++ cluster/gfs2/fsck/Makefile 2007/05/15 14:37:33 1.11
@@ -12,13 +12,27 @@
include ../../make/defines.mk
-TARGET= gfs2_fsck
+TARGET1= gfs2_fsck
+TARGET2= fsck.gfs2
-.PHONY: all clean
-
-sources = main.c initialize.c pass1.c pass1b.c pass1c.c pass2.c pass3.c \
- pass4.c pass5.c util.c fs_recovery.c lost_n_found.c link.c \
- eattr.c hash.c inode_hash.c metawalk.c rgrepair.c
+OBJS= eattr.o \
+ fs_recovery.o \
+ hash.o \
+ initialize.o \
+ inode_hash.o \
+ link.o \
+ lost_n_found.o \
+ main.o \
+ metawalk.o \
+ pass1.o \
+ pass1b.o \
+ pass1c.o \
+ pass2.o \
+ pass3.o \
+ pass4.o \
+ pass5.o \
+ rgrepair.o \
+ util.o
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -MMD -Wall -O2
@@ -27,14 +41,20 @@
LDFLAGS += -L../libgfs2 -lgfs2
-all: ${TARGET}
+all: depends ${TARGET1} ${TARGET2}
-${TARGET}: $(sources:.c=.o)
+${TARGET1}: $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS)
+${TARGET2}: ${TARGET1}
+ ln -fs ${TARGET1} ${TARGET2}
+
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs2 all
+
test_block_list: log.o test_block_list.o
$(CC) -o $@ $^ $(LDFLAGS)
@@ -42,23 +62,23 @@
$(CC) -o $@ $^ $(LDFLAGS)
clean:
- @rm -f gfs2_fsck *.o *~ *.d
+ rm -f ${TARGET1} ${TARGET2} *.o *~ *.d cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
fi
- install -m755 ${TARGET} ${sbindir}
+ install -m755 ${TARGET1} ${sbindir}
+ ln -sf ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
+ ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-distclean: clean
- @rm -f cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
-
-gfs2_fsck.pot: $(sources)
- @xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_ \
+${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 - $(sources) > gfs2_fsck.pot
+ --keyword=log_debug --keyword=log_err --keyword=log_print -d - $(OBJS:.o=.c) > ${TARGET1}.pot
+
+-include $(OBJS:.o=.d)
--include $(sources:.c=.d)
+.PHONY: all ${TARGET1}
--- cluster/gfs2/libgfs2/Makefile 2007/05/03 16:55:56 1.6
+++ cluster/gfs2/libgfs2/Makefile 2007/05/15 14:37:33 1.7
@@ -11,8 +11,6 @@
###############################################################################
###############################################################################
-.PHONY: all clean install
-
include ../../make/defines.mk
TARGET= libgfs2.a
@@ -55,3 +53,5 @@
clean:
rm -f *.o ${TARGET}
+
+.PHONY: all
--- cluster/gfs2/mkfs/Makefile 2007/05/10 15:47:45 1.16
+++ cluster/gfs2/mkfs/Makefile 2007/05/15 14:37:33 1.17
@@ -6,8 +6,9 @@
include ../../make/defines.mk
TARGET1= mkfs.gfs2
-TARGET2= gfs2_jadd
-TARGET3= gfs2_grow
+TARGET2= gfs2_mkfs
+TARGET3= gfs2_jadd
+TARGET4= gfs2_grow
OBJS= main.o \
main_mkfs.o \
@@ -23,28 +24,36 @@
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs2 -lgfs2
-all: ${TARGET1} ${TARGET2} ${TARGET3}
+all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
${TARGET2}: ${TARGET1}
- ln -s ${TARGET1} ${TARGET2}
+ ln -sf ${TARGET1} ${TARGET2}
${TARGET3}: ${TARGET1}
- ln -s ${TARGET1} ${TARGET3}
+ ln -sf ${TARGET1} ${TARGET3}
+
+${TARGET4}: ${TARGET1}
+ ln -sf ${TARGET1} ${TARGET4}
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs2 all
+
install: all
install -m 0755 ${TARGET1} ${sbindir}
- ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
- ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET3}
+ ln -sf ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
+ ln -sf ${sbindir}/${TARGET1} ${sbindir}/${TARGET3}
+ ln -sf ${sbindir}/${TARGET1} ${sbindir}/${TARGET4}
uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
+ ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${sbindir}
clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3}
+ rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+.PHONY: all ${TARGET1}
--- cluster/gfs2/quota/Makefile 2007/05/03 16:55:56 1.8
+++ cluster/gfs2/quota/Makefile 2007/05/15 14:37:33 1.9
@@ -24,9 +24,9 @@
CFLAGS += -O2
CFLAGS += -I../include -I../libgfs2/
-LDFLAGS += -L../libgfs2 -lgfs2 -lgfs2
+LDFLAGS += -L../libgfs2 -lgfs2
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -34,6 +34,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs2 all
+
install: all
install -m 0755 ${TARGET} ${sbindir}
@@ -43,4 +46,4 @@
clean:
rm -f *.o ${TARGET}
-
+.PHONY: all ${TARGET}
--- cluster/gfs2/tool/Makefile 2007/05/03 16:55:56 1.7
+++ cluster/gfs2/tool/Makefile 2007/05/15 14:37:33 1.8
@@ -31,7 +31,7 @@
LDFLAGS += -L../libgfs2 -lgfs2
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -39,6 +39,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../libgfs2 all
+
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
@@ -49,9 +52,6 @@
${UNINSTALL} ${TARGET} ${sbindir}
clean:
- @rm -f ${TARGET} *.o *~
-
-distclean: clean
- @rm -f *.d cscope.* *.orig *.rej
+ rm -f ${TARGET} *.o *~ *.d cscope.* *.orig *.rej
-.PHONY: all clean distclean
+.PHONY: all ${TARGET}
--- cluster/group/dlm_controld/Makefile 2007/04/30 11:22:20 1.5
+++ cluster/group/dlm_controld/Makefile 2007/05/15 14:37:33 1.6
@@ -27,7 +27,7 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../lib -lgroup
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -35,6 +35,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
install: all
install -d ${sbindir}
install ${TARGET} ${sbindir}
@@ -45,3 +48,4 @@
clean:
rm -f *.o ${TARGET}
+.PHONY: all ${TARGET}
--- cluster/group/gfs_controld/Makefile 2007/04/30 11:22:20 1.8
+++ cluster/group/gfs_controld/Makefile 2007/05/15 14:37:34 1.9
@@ -29,7 +29,7 @@
LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg -lSaCkpt
LDFLAGS += -L../lib -lgroup
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -38,6 +38,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
install: all
install -d ${sbindir}
install ${TARGET} ${sbindir}
@@ -47,3 +50,5 @@
clean:
rm -f *.o ${TARGET}
+
+.PHONY: all ${TARGET}
--- cluster/group/tool/Makefile 2007/05/03 16:55:59 1.8
+++ cluster/group/tool/Makefile 2007/05/15 14:37:34 1.9
@@ -20,7 +20,7 @@
CFLAGS += -I. -I../lib/ -I../daemon/
LDFLAGS += -L../lib -lgroup
-all: ${TARGET}
+all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -28,6 +28,9 @@
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../lib all
+
clean:
rm -f *.o ${TARGET}
@@ -37,3 +40,5 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
+
+.PHONY: all ${TARGET}
--- cluster/rgmanager/src/daemons/Makefile 2007/05/03 16:55:59 1.20
+++ cluster/rgmanager/src/daemons/Makefile 2007/05/15 14:37:36 1.21
@@ -66,7 +66,7 @@
LOCAL_LDFLAGS += -llalloc
READLINE_LDFLAGS += -L${readlinelibdir} -lreadline
-all: ${TARGET1} ${TARGET2} ${TARGET3}
+all: depends ${TARGET1} ${TARGET2} ${TARGET3}
${TARGET1}: ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
@@ -107,6 +107,9 @@
%-noccs.o: %.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+depends:
+ $(MAKE) -C ../clulib all
+
install: all
install -d ${sbindir}
install -m755 ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
@@ -117,3 +120,5 @@
clean:
rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
rm -f tests/*.out*
+
+.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
--- cluster/rgmanager/src/utils/Makefile 2007/04/30 11:22:23 1.15
+++ cluster/rgmanager/src/utils/Makefile 2007/05/15 14:37:37 1.16
@@ -12,8 +12,14 @@
include ../../../make/defines.mk
-TARGETS=clubufflush clufindhostname clustat clusvcadm clulog clunfslock
-DISABLEDTARGETS=cluarp
+TARGET1= clubufflush
+TARGET2= clufindhostname
+TARGET3= clustat
+TARGET4= clusvcadm
+TARGET5= clulog
+TARGET6= clunfslock
+
+DISABLEDTARGETS= cluarp
CFLAGS += -DPACKAGE_VERSION=\"${RELEASE}\"
CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
@@ -24,21 +30,41 @@
LDFLAGS += -lcman -lpthread -ldl -lncurses -lccs
LDFLAGS += -L../clulib -lclulib
-all: ${TARGETS}
+all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
+
+${TARGET1}: ${TARGET1:=.o}
+ $(CC) -o $@ $^ $(LDFLAGS)
+
+${TARGET2}: ${TARGET2:=.o}
+ $(CC) -o $@ $^ $(LDFLAGS)
+
+${TARGET3}: ${TARGET3:=.o}
+ $(CC) -o $@ $^ $(LDFLAGS)
-%: %.c
- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+${TARGET4}: ${TARGET4:=.o}
+ $(CC) -o $@ $^ $(LDFLAGS)
-clunfslock: clunfslock.sh
- cp clunfslock.sh clunfslock
- chmod 755 clunfslock
+${TARGET5}: ${TARGET5:=.o}
+ $(CC) -o $@ $^ $(LDFLAGS)
+
+${TARGET6}: ${TARGET6}.sh
+ cp ${TARGET6}.sh ${TARGET6}
+ chmod 755 ${TARGET6}
+
+%.o: %.c
+ $(CC) $(CFLAGS) -c -o $@ $<
+
+depends:
+ $(MAKE) -C ../clulib all
install: all
install -d ${sbindir}
- install $(TARGETS) ${sbindir}
+ install ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
uninstall:
- ${UNINSTALL} $(TARGETS) ${sbindir}
+ ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
clean:
- rm -f *.o $(TARGETS)
+ rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
+
+.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
@ 2007-06-01 9:45 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-06-01 9:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-06-01 09:45:36
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
dlm/lib : Makefile
dlm/tool : Makefile
fence/agents/ipmilan: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/libgfs : Makefile
gfs-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/tool : Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/utils: Makefile
Log message:
* Fix incdir usage across the entire tree so that:
- it can override standard include paths for real
- it is always used after more specific inc overrides
* Clean up a few Makefiles to be more consistent with CFLAGS ordering
* Fix gfs-kernel/src/gfs/Makefile clean: target
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.50&r2=1.51
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- cluster/ccs/ccs_test/Makefile 2007/05/15 14:37:29 1.6
+++ cluster/ccs/ccs_test/Makefile 2007/06/01 09:45:30 1.7
@@ -18,6 +18,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I${ccsincdir}
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/ccs/ccs_tool/Makefile 2007/05/15 14:37:29 1.11
+++ cluster/ccs/ccs_tool/Makefile 2007/06/01 09:45:31 1.12
@@ -24,6 +24,7 @@
CFLAGS += -DCCS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I${ccsincdir} -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I../include
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/ccs/daemon/Makefile 2007/05/15 14:37:29 1.13
+++ cluster/ccs/daemon/Makefile 2007/06/01 09:45:31 1.14
@@ -24,6 +24,7 @@
CFLAGS += -Wall
CFLAGS += -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I. -I../include -I../common
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/ccs/lib/Makefile 2007/05/03 16:55:51 1.6
+++ cluster/ccs/lib/Makefile 2007/06/01 09:45:31 1.7
@@ -20,6 +20,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -fPIC
CFLAGS += -I../include -I../common
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -DDEBUG -g
--- cluster/cman/cman_tool/Makefile 2007/05/15 14:37:30 1.21
+++ cluster/cman/cman_tool/Makefile 2007/06/01 09:45:31 1.22
@@ -19,7 +19,8 @@
CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -DSBINDIR=\"${sbindir}\"
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -g -DDEBUG
--- cluster/cman/daemon/Makefile 2007/05/15 14:37:30 1.50
+++ cluster/cman/daemon/Makefile 2007/06/01 09:45:31 1.51
@@ -14,8 +14,8 @@
CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\" -DOPENAIS_EXTERNAL_SERVICE
CFLAGS += -fPIC
-CFLAGS += -I${ccsincdir} -I${incdir} -I${openaisincdir} -I${cmanincdir}
-CFLAGS += -I${openaisincdir}/openais/service
+CFLAGS += -I${ccsincdir} -I${openaisincdir} -I${cmanincdir}
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -g -DDEBUG
--- cluster/cman/lib/Makefile 2007/05/03 16:55:52 1.9
+++ cluster/cman/lib/Makefile 2007/06/01 09:45:31 1.10
@@ -20,6 +20,7 @@
CFLAGS += -g -I. -fPIC
CFLAGS += -I../daemon
+CFLAGS += -I${incdir}
all: $(STATICLIB) $(SHAREDLIB)
--- cluster/cman/qdisk/Makefile 2007/05/15 14:37:30 1.10
+++ cluster/cman/qdisk/Makefile 2007/06/01 09:45:31 1.11
@@ -14,8 +14,9 @@
CFLAGS += -D_GNU_SOURCE
CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -g
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -I.
+CFLAGS += -I${incdir}
EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs
EXTRA_LDFLAGS += -lpthread
--- cluster/cman/tests/Makefile 2007/04/30 11:22:02 1.6
+++ cluster/cman/tests/Makefile 2007/06/01 09:45:31 1.7
@@ -1,8 +1,9 @@
include ../../make/defines.mk
-CFLAGS+= -g -I${cmanincdir}
+CFLAGS += -g -I${cmanincdir}
+CFLAGS += -I${incdir}
-LDFLAGS+= -L${cmanlibdir} -lcman
+LDFLAGS += -L${cmanlibdir} -lcman
TARGET=client libtest sysman sysmand
--- cluster/dlm/lib/Makefile 2007/05/03 16:55:52 1.19
+++ cluster/dlm/lib/Makefile 2007/06/01 09:45:31 1.20
@@ -21,6 +21,7 @@
CFLAGS += -g -O2
CFLAGS += -I.
+CFLAGS += -I${incdir}
LDFLAGS += -lpthread
--- cluster/dlm/tool/Makefile 2007/05/18 16:39:51 1.1
+++ cluster/dlm/tool/Makefile 2007/06/01 09:45:32 1.2
@@ -18,6 +18,8 @@
CFLAGS += -g
CFLAGS += -I. -I../lib/
+CFLAGS += -I${incdir}
+
LDFLAGS += -L../lib -ldlm
all: ${TARGET}
--- cluster/fence/agents/ipmilan/Makefile 2007/05/03 16:55:52 1.5
+++ cluster/fence/agents/ipmilan/Makefile 2007/06/01 09:45:32 1.6
@@ -19,6 +19,7 @@
ipmilan.o
CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\" -DFENCE
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/fence/agents/rackswitch/Makefile 2007/05/03 16:55:52 1.4
+++ cluster/fence/agents/rackswitch/Makefile 2007/06/01 09:45:32 1.5
@@ -18,8 +18,7 @@
OBJS= do_rack.o
CFLAGS += -DFENCE_RELEASE_NAME=\"${RELEASE}\"
-
-# INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/fence/agents/rps10/Makefile 2007/05/03 16:55:53 1.4
+++ cluster/fence/agents/rps10/Makefile 2007/06/01 09:45:32 1.5
@@ -18,6 +18,7 @@
OBJS= rps10.o
CFLAGS+= -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/fence/agents/xvm/Makefile 2007/05/03 16:55:53 1.7
+++ cluster/fence/agents/xvm/Makefile 2007/06/01 09:45:32 1.8
@@ -34,6 +34,7 @@
CFLAGS += -Wall -Werror -Wstrict-prototypes -Wshadow -ggdb
CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir}
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${dlmlibdir}
LDFLAGS += -L${nsslibdir} -L${nsprlibdir} -L${libdir}
--- cluster/fence/fence_node/Makefile 2007/05/03 16:55:54 1.7
+++ cluster/fence/fence_node/Makefile 2007/06/01 09:45:32 1.8
@@ -26,8 +26,9 @@
CFLAGS += -O2
endif
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
--- cluster/fence/fence_tool/Makefile 2007/05/03 16:55:54 1.14
+++ cluster/fence/fence_tool/Makefile 2007/06/01 09:45:32 1.15
@@ -18,9 +18,10 @@
OBJS= ../fenced/agent.o \
fence_tool.o
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
-CFLAGS += -I../include -I../../group/lib
CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I../include -I../../group/lib
+CFLAGS += -I${incdir}
ifeq ($(DEBUG),y)
CFLAGS += -O0 -g
--- cluster/fence/fenced/Makefile 2007/05/03 16:55:54 1.9
+++ cluster/fence/fenced/Makefile 2007/06/01 09:45:32 1.10
@@ -23,8 +23,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DFENCE_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -g
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${incdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -I. -I../include -I../../group/lib
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../../group/lib -l group
--- cluster/gfs/gfs_debug/Makefile 2007/05/03 16:55:54 1.7
+++ cluster/gfs/gfs_debug/Makefile 2007/06/01 09:45:32 1.8
@@ -24,8 +24,9 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
-CFLAGS += -I${gfskincdir} -I${incdir}
+CFLAGS += -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gfs/gfs_edit/Makefile 2007/05/03 16:55:54 1.8
+++ cluster/gfs/gfs_edit/Makefile 2007/06/01 09:45:33 1.9
@@ -21,6 +21,7 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I${gfskincdir} -I${ncursesincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${ncurseslibdir} -lncurses
--- cluster/gfs/gfs_fsck/Makefile 2007/05/15 14:37:30 1.10
+++ cluster/gfs/gfs_fsck/Makefile 2007/06/01 09:45:33 1.11
@@ -49,6 +49,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -MMD -O2
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET1} ${TARGET2}
--- cluster/gfs/gfs_grow/Makefile 2007/05/15 14:37:31 1.9
+++ cluster/gfs/gfs_grow/Makefile 2007/06/01 09:45:33 1.10
@@ -19,8 +19,9 @@
ondisk.o
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
-CFLAGS += -I${gfskincdir} -I${incdir}
+CFLAGS += -I${gfskincdir}
CFLAGS += -I../include -I../libgfs
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs -lgfs
--- cluster/gfs/gfs_jadd/Makefile 2007/05/15 14:37:32 1.9
+++ cluster/gfs/gfs_jadd/Makefile 2007/06/01 09:45:33 1.10
@@ -19,8 +19,9 @@
ondisk.o
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
-CFLAGS += -I${gfskincdir} -I${incdir}
+CFLAGS += -I${gfskincdir}
CFLAGS += -I../include -I../libgfs
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs -lgfs
--- cluster/gfs/gfs_mkfs/Makefile 2007/05/15 14:37:32 1.9
+++ cluster/gfs/gfs_mkfs/Makefile 2007/06/01 09:45:33 1.10
@@ -25,8 +25,9 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
-CFLAGS += -I${gfskincdir} -I${incdir} -I${volidincdir}
+CFLAGS += -I${gfskincdir} -I${volidincdir}
CFLAGS += -I../include -I../libgfs
+CFLAGS += -I${incdir}
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs -lgfs
--- cluster/gfs/gfs_quota/Makefile 2007/05/03 16:55:55 1.8
+++ cluster/gfs/gfs_quota/Makefile 2007/06/01 09:45:33 1.9
@@ -25,6 +25,7 @@
CFLAGS += -O2
CFLAGS += -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gfs/gfs_tool/Makefile 2007/05/03 16:55:55 1.11
+++ cluster/gfs/gfs_tool/Makefile 2007/06/01 09:45:33 1.12
@@ -29,6 +29,7 @@
CFLAGS += -O2 -Wall
CFLAGS += -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gfs/libgfs/Makefile 2007/05/15 14:37:32 1.6
+++ cluster/gfs/libgfs/Makefile 2007/06/01 09:45:33 1.7
@@ -15,11 +15,12 @@
TARGET=libgfs.a
-CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
-CFLAGS += -I${gfskincdir} -I../include
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -c -Wall -ggdb
+CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
+CFLAGS += -I${gfskincdir} -I../include
+CFLAGS += -I${incdir}
OBJS= bio.o \
bitmap.o \
--- cluster/gfs-kernel/src/gfs/Makefile 2007/04/30 11:22:15 1.15
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/06/01 09:45:33 1.16
@@ -74,6 +74,6 @@
clean:
rm -rf linux *.o .*.o.cmd .gfs.ko.cmd \
- gfs.ko gfs.mod.c .tmp_versions *~ *~* Modules.symvers
+ gfs.ko gfs.mod.c .tmp_versions *~ *~* Module.symvers
distclean: clean
--- cluster/gfs2/convert/Makefile 2007/05/15 14:37:32 1.8
+++ cluster/gfs2/convert/Makefile 2007/06/01 09:45:34 1.9
@@ -18,8 +18,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -Wall -g
-CFLAGS += -I${incdir} -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
+CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include -I../libgfs2
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/edit/Makefile 2007/05/15 14:37:32 1.7
+++ cluster/gfs2/edit/Makefile 2007/06/01 09:45:34 1.8
@@ -22,6 +22,7 @@
CFLAGS += -ggdb
CFLAGS += -I${ncursesincdir}
CFLAGS += -I../include -I../libgfs2
+CFLAGS += -I${incdir}
LDFLAGS += -L${ncurseslibdir} -lncurses
LDFLAGS += -L../libgfs2/ -lgfs2
--- cluster/gfs2/fsck/Makefile 2007/05/15 14:37:33 1.11
+++ cluster/gfs2/fsck/Makefile 2007/06/01 09:45:34 1.12
@@ -38,6 +38,7 @@
CFLAGS += -MMD -Wall -O2
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include -I../libgfs2
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/libgfs2/Makefile 2007/05/15 14:37:33 1.7
+++ cluster/gfs2/libgfs2/Makefile 2007/06/01 09:45:34 1.8
@@ -19,8 +19,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -Wall -ggdb
-CFLAGS += -I${incdir} -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
+CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
CFLAGS += -I../include
+CFLAGS += -I${incdir}
OBJS= bitmap.o \
block_list.o \
--- cluster/gfs2/mkfs/Makefile 2007/05/15 14:37:33 1.17
+++ cluster/gfs2/mkfs/Makefile 2007/06/01 09:45:34 1.18
@@ -20,6 +20,7 @@
CFLAGS += -Wall -O2 -ggdb
CFLAGS += -I${KERNEL_SRC}/include/
CFLAGS += -I../include/ -I../libgfs2/
+CFLAGS += -I${incdir}
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/mount/Makefile 2007/05/03 16:55:56 1.13
+++ cluster/gfs2/mount/Makefile 2007/06/01 09:45:34 1.14
@@ -26,8 +26,9 @@
CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64
CFLAGS += -DGFS2_RELEASE_NAME=\"${RELEASE}\" -D_GNU_SOURCE
CFLAGS += -O2
-CFLAGS += -I${incdir} -I${gfs2kincdir} -I${gfskincdir}
+CFLAGS += -I${gfs2kincdir} -I${gfskincdir}
CFLAGS += -I../include
+CFLAGS += -I${incdir}
all: ${TARGET1} ${TARGET2}
--- cluster/gfs2/quota/Makefile 2007/05/15 14:37:33 1.9
+++ cluster/gfs2/quota/Makefile 2007/06/01 09:45:34 1.10
@@ -23,6 +23,7 @@
CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
CFLAGS += -I../include -I../libgfs2/
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gfs2/tool/Makefile 2007/05/15 14:37:33 1.8
+++ cluster/gfs2/tool/Makefile 2007/06/01 09:45:34 1.9
@@ -28,6 +28,7 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -DGFS2_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2 -Wall
CFLAGS += -I../include
+CFLAGS += -I${incdir}
LDFLAGS += -L../libgfs2 -lgfs2
--- cluster/gnbd/client/Makefile 2007/05/03 16:55:56 1.12
+++ cluster/gnbd/client/Makefile 2007/06/01 09:45:35 1.13
@@ -29,6 +29,7 @@
CFLAGS += -O2
CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../include -I../server -I../utils
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/gnbd/server/Makefile 2007/05/03 16:55:56 1.12
+++ cluster/gnbd/server/Makefile 2007/06/01 09:45:35 1.13
@@ -32,8 +32,9 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -O2
-CFLAGS += -I${gnbdkincdir} -I${incdir} -I${cmanincdir}
+CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../include -I../utils
+CFLAGS += -I${incdir}
LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/05/03 16:55:57 1.4
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/06/01 09:45:35 1.5
@@ -19,6 +19,7 @@
CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -I../../include -I../../tools/gnbd_import
+CFLAGS += -I${incdir}
all: ${TARGET}
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/05/03 16:55:57 1.13
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/06/01 09:45:35 1.14
@@ -21,8 +21,9 @@
CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\"
CFLAGS += -O2
-CFLAGS += -I${gnbdkincdir} -I${incdir} -I${cmanincdir}
+CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../../include -I../../server -I../../utils
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/05/03 16:55:57 1.10
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/06/01 09:45:35 1.11
@@ -24,6 +24,7 @@
CFLAGS += -O2
CFLAGS += -I${gnbdkincdir} -I${cmanincdir}
CFLAGS += -I../../include -I../../client -I../../server -I../../utils
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
--- cluster/group/daemon/Makefile 2007/05/03 16:55:57 1.18
+++ cluster/group/daemon/Makefile 2007/06/01 09:45:35 1.19
@@ -23,6 +23,7 @@
CFLAGS += -g
CFLAGS += -I${cmanincdir}
CFLAGS += -I. -I../include/ -I../lib/
+CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg
--- cluster/group/dlm_controld/Makefile 2007/05/15 14:37:33 1.6
+++ cluster/group/dlm_controld/Makefile 2007/06/01 09:45:35 1.7
@@ -20,9 +20,10 @@
action.o
CFLAGS += -g
-CFLAGS += -I${incdir} -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
CFLAGS += -idirafter ${KERNEL_SRC}/include/linux
CFLAGS += -I../../group/lib/ -I../include/
+CFLAGS += -I${incdir}
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../lib -lgroup
--- cluster/group/gfs_controld/Makefile 2007/05/15 14:37:34 1.9
+++ cluster/group/gfs_controld/Makefile 2007/06/01 09:45:35 1.10
@@ -22,9 +22,10 @@
recover.o
CFLAGS += -g -O2
-CFLAGS += -I${cmanincdir} -I${incdir}
+CFLAGS += -I${cmanincdir}
CFLAGS += -idirafter ${KERNEL_SRC}/include/linux
CFLAGS += -I../include/ -I../lib/
+CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg -lSaCkpt
LDFLAGS += -L../lib -lgroup
--- cluster/group/lib/Makefile 2007/05/03 16:55:58 1.5
+++ cluster/group/lib/Makefile 2007/06/01 09:45:35 1.6
@@ -17,6 +17,7 @@
CFLAGS += -g -O -fPIC
CFLAGS += -I. -I../daemon
+CFLAGS += -I${incdir}
all: $(STATICLIB)
--- cluster/group/tool/Makefile 2007/05/15 14:37:34 1.9
+++ cluster/group/tool/Makefile 2007/06/01 09:45:36 1.10
@@ -18,6 +18,8 @@
CFLAGS += -g
CFLAGS += -I. -I../lib/ -I../daemon/
+CFLAGS += -I${incdir}
+
LDFLAGS += -L../lib -lgroup
all: depends ${TARGET}
--- cluster/rgmanager/src/clulib/Makefile 2007/05/03 16:55:59 1.14
+++ cluster/rgmanager/src/clulib/Makefile 2007/06/01 09:45:36 1.15
@@ -27,8 +27,9 @@
CFLAGS += -DCMAN_RELEASE_NAME=\"${RELEASE}\"
CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
-CFLAGS += -I${incdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${cmanincdir} -I${dlmincdir}
CFLAGS += -I../../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${cmanlibdir} -lcman
LDFLAGS += -L. -lclulib -llalloc
--- cluster/rgmanager/src/daemons/Makefile 2007/05/15 14:37:36 1.21
+++ cluster/rgmanager/src/daemons/Makefile 2007/06/01 09:45:36 1.22
@@ -49,9 +49,10 @@
CFLAGS += -D_GNU_SOURCE -DSHAREDIR=\"${sharedir}\"
CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC
-CFLAGS += -I${incdir} -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
CFLAGS += `xml2-config --cflags` -I${readlineincdir}
CFLAGS += -I../../include
+CFLAGS += -I${incdir}
EXTRA_CFLAGS += -DNO_CCS
--- cluster/rgmanager/src/utils/Makefile 2007/05/15 14:37:37 1.16
+++ cluster/rgmanager/src/utils/Makefile 2007/06/01 09:45:36 1.17
@@ -23,8 +23,9 @@
CFLAGS += -DPACKAGE_VERSION=\"${RELEASE}\"
CFLAGS += -g -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
-CFLAGS += -I${incdir} -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir}
CFLAGS += -I../../include
+CFLAGS += -I${incdir}
LDFLAGS += -L${libdir} -L${ccslibdir} -L${cmanlibdir} -L${ncurseslibdir}
LDFLAGS += -lcman -lpthread -ldl -lncurses -lccs
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
@ 2007-12-21 9:15 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-12-21 9:15 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-12-21 09:15:21
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
dlm/lib : Makefile
dlm/tests/usertest: Makefile
dlm/tool : Makefile
fence/agents/ipmilan: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/libgfs : Makefile
gfs/tests/filecon2: Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
gnbd/utils : Makefile
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/test : Makefile
group/tool : Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/utils: Makefile
Added files:
make : cobj.mk
Log message:
A long time ago we did start collecting common Makefile snippets in one
location.
This time we shrink all common objects rules in make/cobj.mk
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.57&r2=1.58
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/filecon2/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/test/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/cobj.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
--- cluster/ccs/ccs_test/Makefile 2007/12/20 22:09:56 1.10
+++ cluster/ccs/ccs_test/Makefile 2007/12/21 09:15:13 1.11
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= ccs_test
@@ -27,9 +28,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/ccs/ccs_tool/Makefile 2007/12/20 22:09:56 1.16
+++ cluster/ccs/ccs_tool/Makefile 2007/12/21 09:15:14 1.17
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= ccs_tool
@@ -33,9 +34,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/ccs/daemon/Makefile 2007/12/20 22:09:56 1.18
+++ cluster/ccs/daemon/Makefile 2007/12/21 09:15:14 1.19
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= ccsd
@@ -33,9 +34,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/ccs/lib/Makefile 2007/12/20 22:09:56 1.10
+++ cluster/ccs/lib/Makefile 2007/12/21 09:15:14 1.11
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET=libccs.a
@@ -28,9 +29,6 @@
${AR} cr $@ $^
${RANLIB} $@
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
log.c:
ln -sf $(S)/../common/log.c log.c
--- cluster/cman/cman_tool/Makefile 2007/12/20 22:09:56 1.26
+++ cluster/cman/cman_tool/Makefile 2007/12/21 09:15:14 1.27
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET=cman_tool
@@ -28,9 +29,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/cman/daemon/Makefile 2007/12/20 22:09:56 1.57
+++ cluster/cman/daemon/Makefile 2007/12/21 09:15:14 1.58
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
CFLAGS += -DOPENAIS_EXTERNAL_SERVICE
CFLAGS += -fPIC
@@ -34,9 +35,6 @@
${TARGET}: ${OBJS}
$(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/cman/lib/Makefile 2007/12/20 22:09:57 1.12
+++ cluster/cman/lib/Makefile 2007/12/21 09:15:14 1.13
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET=libcman
@@ -33,9 +34,6 @@
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so.$(RELEASE_MAJOR)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
install -d ${incdir}
install $(S)/$(TARGET).h ${incdir}
--- cluster/cman/qdisk/Makefile 2007/12/20 22:09:57 1.14
+++ cluster/cman/qdisk/Makefile 2007/12/21 09:15:14 1.15
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
CFLAGS += -D_GNU_SOURCE
CFLAGS += -Werror -Wstrict-prototypes -Wshadow
@@ -50,9 +51,6 @@
install -d ${sbindir}
install ${TARGET1} ${TARGET2} ${sbindir}
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/cman/tests/Makefile 2007/12/20 22:09:57 1.10
+++ cluster/cman/tests/Makefile 2007/12/21 09:15:14 1.11
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGETS= client libtest sysman sysmand
@@ -24,9 +25,6 @@
depends:
$(MAKE) -C ../lib all
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/dlm/lib/Makefile 2007/12/20 22:09:57 1.23
+++ cluster/dlm/lib/Makefile 2007/12/21 09:15:15 1.24
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= libdlm
AISTARGET= libaislock
--- cluster/dlm/tests/usertest/Makefile 2007/12/20 22:09:57 1.14
+++ cluster/dlm/tests/usertest/Makefile 2007/12/21 09:15:15 1.15
@@ -11,6 +11,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGETS= dlmtest asttest lstest pingtest lvb dlmtest2 flood alternate-lvb joinleave threads
@@ -25,9 +26,6 @@
depends:
$(MAKE) -C ../../lib all
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/dlm/tool/Makefile 2007/12/20 22:09:57 1.5
+++ cluster/dlm/tool/Makefile 2007/12/21 09:15:15 1.6
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= dlm_tool
@@ -27,9 +28,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
clean:
rm -f *.o ${TARGET}
--- cluster/fence/agents/ipmilan/Makefile 2007/12/20 22:09:58 1.9
+++ cluster/fence/agents/ipmilan/Makefile 2007/12/21 09:15:15 1.10
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= fence_ipmilan
@@ -25,9 +26,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/fence/agents/rackswitch/Makefile 2007/12/20 22:09:58 1.7
+++ cluster/fence/agents/rackswitch/Makefile 2007/12/21 09:15:15 1.8
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= fence_rackswitch
@@ -24,9 +25,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/fence/agents/rps10/Makefile 2007/12/20 22:09:58 1.7
+++ cluster/fence/agents/rps10/Makefile 2007/12/21 09:15:15 1.8
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= fence_rps10
@@ -24,9 +25,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/fence/agents/xvm/Makefile 2007/12/20 22:09:58 1.16
+++ cluster/fence/agents/xvm/Makefile 2007/12/21 09:15:15 1.17
@@ -11,6 +11,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= fence_xvm
TARGET2= fence_xvmd
@@ -60,12 +61,6 @@
${TARGET3}: ${OBJS3}
$(CC) -o $@ $^ $(XML_LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
-%-standalone.o: $(S)/%.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-
clean:
rm -f ${TARGET1} ${TARGET2} ${TARGET3} *~ *.o
--- cluster/fence/fence_node/Makefile 2007/12/20 22:09:58 1.11
+++ cluster/fence/fence_node/Makefile 2007/12/21 09:15:15 1.12
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET = fence_node
@@ -31,9 +32,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/fence/fence_tool/Makefile 2007/12/20 22:09:58 1.18
+++ cluster/fence/fence_tool/Makefile 2007/12/21 09:15:15 1.19
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET = fence_tool
@@ -31,9 +32,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/fence/fenced/Makefile 2007/12/20 22:09:59 1.14
+++ cluster/fence/fenced/Makefile 2007/12/21 09:15:15 1.15
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET = fenced
@@ -34,9 +35,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gfs/gfs_debug/Makefile 2007/12/20 22:09:59 1.11
+++ cluster/gfs/gfs_debug/Makefile 2007/12/21 09:15:16 1.12
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs_debug
@@ -32,9 +33,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gfs/gfs_edit/Makefile 2007/12/20 22:09:59 1.11
+++ cluster/gfs/gfs_edit/Makefile 2007/12/21 09:15:16 1.12
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs_edit
@@ -30,9 +31,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gfs/gfs_fsck/Makefile 2007/12/20 22:09:59 1.14
+++ cluster/gfs/gfs_fsck/Makefile 2007/12/21 09:15:16 1.15
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= gfs_fsck
TARGET2= fsck.gfs
@@ -59,9 +60,6 @@
${TARGET2}: ${TARGET1}
ln -s ${TARGET1} ${TARGET2}
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
test_block_list: block_list.o bitmap.o log.o test_block_list.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_grow/Makefile 2007/12/20 22:09:59 1.12
+++ cluster/gfs/gfs_grow/Makefile 2007/12/21 09:15:16 1.13
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs_grow
@@ -30,9 +31,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs all
--- cluster/gfs/gfs_jadd/Makefile 2007/12/20 22:09:59 1.12
+++ cluster/gfs/gfs_jadd/Makefile 2007/12/21 09:15:16 1.13
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs_jadd
@@ -30,9 +31,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs all
--- cluster/gfs/gfs_mkfs/Makefile 2007/12/20 22:09:59 1.13
+++ cluster/gfs/gfs_mkfs/Makefile 2007/12/21 09:15:16 1.14
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= gfs_mkfs
TARGET2= mkfs.gfs
@@ -39,9 +40,6 @@
${TARGET2}: ${TARGET1}
ln -sf ${TARGET1} ${TARGET2}
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs all
--- cluster/gfs/gfs_quota/Makefile 2007/12/20 22:09:59 1.12
+++ cluster/gfs/gfs_quota/Makefile 2007/12/21 09:15:16 1.13
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs_quota
@@ -31,9 +32,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gfs/gfs_tool/Makefile 2007/12/20 22:10:00 1.16
+++ cluster/gfs/gfs_tool/Makefile 2007/12/21 09:15:16 1.17
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs_tool
@@ -35,9 +36,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gfs/libgfs/Makefile 2007/12/20 22:10:00 1.12
+++ cluster/gfs/libgfs/Makefile 2007/12/21 09:15:16 1.13
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET=libgfs.a
@@ -44,9 +45,6 @@
${AR} cru $@ $^
${RANLIB} $@
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
uninstall:
--- cluster/gfs/tests/filecon2/Makefile 2007/12/20 22:10:01 1.3
+++ cluster/gfs/tests/filecon2/Makefile 2007/12/21 09:15:17 1.4
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGETS= filecon2_server filecon2_client
@@ -21,9 +22,6 @@
all: $(TARGETS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/convert/Makefile 2007/12/20 22:10:01 1.13
+++ cluster/gfs2/convert/Makefile 2007/12/21 09:15:17 1.14
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs2_convert
@@ -28,9 +29,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs2 all
--- cluster/gfs2/edit/Makefile 2007/12/20 22:10:01 1.13
+++ cluster/gfs2/edit/Makefile 2007/12/21 09:15:17 1.14
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs2_edit
@@ -33,9 +34,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs2 all
--- cluster/gfs2/fsck/Makefile 2007/12/20 22:10:01 1.17
+++ cluster/gfs2/fsck/Makefile 2007/12/21 09:15:17 1.18
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= fsck.gfs2
TARGET2= gfs2_fsck
@@ -50,9 +51,6 @@
${TARGET2}: ${TARGET1}
ln -fs ${TARGET1} ${TARGET2}
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs2 all
--- cluster/gfs2/libgfs2/Makefile 2007/12/20 22:10:01 1.14
+++ cluster/gfs2/libgfs2/Makefile 2007/12/21 09:15:17 1.15
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= libgfs2.a
@@ -43,9 +44,6 @@
${AR} cru $@ $^
${RANLIB} $@
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
uninstall:
--- cluster/gfs2/mkfs/Makefile 2007/12/20 22:10:02 1.22
+++ cluster/gfs2/mkfs/Makefile 2007/12/21 09:15:18 1.23
@@ -4,6 +4,7 @@
.PHONY: all clean install
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= mkfs.gfs2
TARGET2= gfs2_mkfs
@@ -37,9 +38,6 @@
${TARGET4}: ${TARGET1}
ln -sf ${TARGET1} ${TARGET4}
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs2 all
--- cluster/gfs2/mount/Makefile 2007/12/20 22:10:02 1.20
+++ cluster/gfs2/mount/Makefile 2007/12/21 09:15:18 1.21
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= mount.gfs2
TARGET2= umount.gfs2
@@ -37,9 +38,6 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
mkdir -p ${DESTDIR}/sbin
install ${TARGET1} ${TARGET2} ${DESTDIR}/sbin
--- cluster/gfs2/quota/Makefile 2007/12/20 22:10:02 1.14
+++ cluster/gfs2/quota/Makefile 2007/12/21 09:15:18 1.15
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs2_quota
@@ -31,9 +32,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs2 all
--- cluster/gfs2/tool/Makefile 2007/12/20 22:10:02 1.16
+++ cluster/gfs2/tool/Makefile 2007/12/21 09:15:18 1.17
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs2_tool
@@ -36,9 +37,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../libgfs2 all
--- cluster/gnbd/client/Makefile 2007/12/20 22:10:02 1.16
+++ cluster/gnbd/client/Makefile 2007/12/21 09:15:18 1.17
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= gnbd_recvd
TARGET2= gnbd_monitor
@@ -39,9 +40,6 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gnbd/server/Makefile 2007/12/20 22:10:02 1.16
+++ cluster/gnbd/server/Makefile 2007/12/21 09:15:18 1.17
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= gnbd_serv
TARGET2= gnbd_clusterd
@@ -44,9 +45,6 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/20 22:10:03 1.7
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/21 09:15:18 1.8
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= fence_gnbd
@@ -25,9 +26,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/20 22:10:03 1.17
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/21 09:15:18 1.18
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gnbd_export
@@ -31,9 +32,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/20 22:10:03 1.14
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/21 09:15:19 1.15
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gnbd_import
@@ -32,9 +33,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
if [ ! -d ${sbindir} ]; then \
install -d ${sbindir}; \
--- cluster/gnbd/utils/Makefile 2007/12/20 22:10:03 1.2
+++ cluster/gnbd/utils/Makefile 2007/12/21 09:15:19 1.3
@@ -12,6 +12,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
SHAREDOBJS= member_cman.o \
trans.o \
@@ -22,9 +23,6 @@
all: ${SHAREDOBJS}
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install:
uninstall:
--- cluster/group/daemon/Makefile 2007/12/20 22:10:03 1.22
+++ cluster/group/daemon/Makefile 2007/12/21 09:15:19 1.23
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= groupd
@@ -31,9 +32,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
clean:
rm -f *.o groupd
--- cluster/group/dlm_controld/Makefile 2007/12/20 22:10:03 1.13
+++ cluster/group/dlm_controld/Makefile 2007/12/21 09:15:19 1.14
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= dlm_controld
@@ -34,9 +35,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/group/gfs_controld/Makefile 2007/12/20 22:10:03 1.15
+++ cluster/group/gfs_controld/Makefile 2007/12/21 09:15:19 1.16
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= gfs_controld
@@ -36,10 +37,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
--- cluster/group/lib/Makefile 2007/12/20 22:10:03 1.9
+++ cluster/group/lib/Makefile 2007/12/21 09:15:19 1.10
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET=libgroup
STATICLIB=$(TARGET).a
@@ -25,9 +26,6 @@
${AR} r $@ $^
${RANLIB} $@
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
install: all
uninstall:
--- cluster/group/test/Makefile 2007/12/20 22:10:04 1.4
+++ cluster/group/test/Makefile 2007/12/21 09:15:20 1.5
@@ -11,14 +11,12 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGETS= client clientd
all: $(TARGETS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/tool/Makefile 2007/12/20 22:10:04 1.12
+++ cluster/group/tool/Makefile 2007/12/21 09:15:20 1.13
@@ -11,6 +11,7 @@
###############################################################################
include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET= group_tool
@@ -26,9 +27,6 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../lib all
/cvs/cluster/cluster/make/cobj.mk,v --> standard output
revision 1.1
--- cluster/make/cobj.mk
+++ - 2007-12-21 09:15:28.927840000 +0000
@@ -0,0 +1,10 @@
+%.o: $(S)/%.c
+ $(CC) $(CFLAGS) -c -o $@ $<
+
+# used by rgmanager/src/daemons
+%-noccs.o: $(S)/%.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+
+# used by fence/agents/xvm
+%-standalone.o: $(S)/%.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
--- cluster/rgmanager/src/clulib/Makefile 2007/12/20 22:10:05 1.20
+++ cluster/rgmanager/src/clulib/Makefile 2007/12/21 09:15:21 1.21
@@ -11,6 +11,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= libclulib.a
TARGET2= liblalloc.a
@@ -51,8 +52,5 @@
${TARGET3}: ${OBJS3} ${TARGET1}
$(CC) -o $@ $^ $(LDFLAGS)
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
clean:
rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3}
--- cluster/rgmanager/src/daemons/Makefile 2007/12/20 22:10:05 1.27
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/21 09:15:21 1.28
@@ -11,6 +11,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= clurgmgrd
TARGET2= clurmtabd
@@ -110,12 +111,6 @@
check: rg_test
cd tests && ./runtests.sh
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
-%-noccs.o: $(S)/%.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../clulib all
--- cluster/rgmanager/src/utils/Makefile 2007/12/20 22:10:05 1.20
+++ cluster/rgmanager/src/utils/Makefile 2007/12/21 09:15:21 1.21
@@ -11,6 +11,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
TARGET1= clubufflush
TARGET2= clufindhostname
@@ -51,9 +52,6 @@
cp $(S)/${TARGET6}.sh ${TARGET6}
chmod 755 ${TARGET6}
-%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
depends:
$(MAKE) -C ../clulib all
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
@ 2007-12-21 20:14 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-12-21 20:14 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-12-21 20:13:55
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
ccs/man : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/init.d : Makefile
cman/lib : Makefile
cman/man : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
dlm/lib : Makefile
dlm/man : Makefile
dlm/tests/usertest: Makefile
dlm/tool : Makefile
fence/agents/apc: Makefile
fence/agents/baytech: Makefile
fence/agents/bladecenter: Makefile
fence/agents/brocade: Makefile
fence/agents/bullpap: Makefile
fence/agents/cpint: Makefile
fence/agents/drac: Makefile
fence/agents/egenera: Makefile
fence/agents/ibmblade: Makefile
fence/agents/ilo: Makefile
fence/agents/ipmilan: Makefile
fence/agents/manual: Makefile
fence/agents/mcdata: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/rsa: Makefile
fence/agents/rsb: Makefile
fence/agents/sanbox2: Makefile
fence/agents/scsi: Makefile
fence/agents/vixel: Makefile
fence/agents/vmware: Makefile
fence/agents/wti: Makefile
fence/agents/xcat: Makefile
fence/agents/xvm: Makefile
fence/agents/zvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
fence/man : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/init.d : Makefile
gfs/libgfs : Makefile
gfs/man : Makefile
gfs/tests/filecon2: Makefile
gfs/tests/mmdd : Makefile
gfs-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/init.d : Makefile
gfs2/libgfs2 : Makefile
gfs2/man : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/man : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
gnbd/utils : Makefile
gnbd-kernel/src: Makefile
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/man : Makefile
group/test : Makefile
group/tool : Makefile
make : fenceperl.mk fencepy.mk
rgmanager/init.d: Makefile
rgmanager/man : Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/utils: Makefile
Added files:
make : clean.mk
Log message:
Collapse all common clean: target bits into make/clean.mk generalclean: target.
Update all relevant makefile's to use generalclean.
Required by this change:
all TARGETS need to be defined before sourcing *.mk files to allow
simpler var expantions.
update all makefiles as a consequence
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.58&r2=1.59
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/man/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/baytech/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bladecenter/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/brocade/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bullpap/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/cpint/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/egenera/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ibmblade/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ilo/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/mcdata/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsa/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsb/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/sanbox2/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vixel/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vmware/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/wti/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xcat/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/zvm/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/man/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/filecon2/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/mmdd/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/man/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/test/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/clean.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fenceperl.mk.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fencepy.mk.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/man/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
--- cluster/ccs/ccs_test/Makefile 2007/12/21 09:15:13 1.11
+++ cluster/ccs/ccs_test/Makefile 2007/12/21 20:13:43 1.12
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= ccs_test
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= ccs_test
+include $(OBJDIR)/make/clean.mk
OBJS= ccs_test.o
@@ -38,7 +39,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *.o ${TARGET} *~
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/ccs/ccs_tool/Makefile 2007/12/21 09:15:14 1.17
+++ cluster/ccs/ccs_tool/Makefile 2007/12/21 20:13:43 1.18
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= ccs_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= ccs_tool
+include $(OBJDIR)/make/clean.mk
OBJS= ccs_tool.o \
update.o \
@@ -37,9 +38,6 @@
depends:
$(MAKE) -C ../lib all
-clean:
- rm -f *.o ccs_tool *~
-
install: all
install -d ${sbindir}
install ccs_tool ${sbindir}
@@ -47,4 +45,6 @@
uninstall:
${UNINSTALL} ccs_tool ${sbindir}
+clean: generalclean
+
.PHONY: all ${TARGET}
--- cluster/ccs/daemon/Makefile 2007/12/21 09:15:14 1.19
+++ cluster/ccs/daemon/Makefile 2007/12/21 20:13:43 1.20
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= ccsd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= ccsd
+include $(OBJDIR)/make/clean.mk
OBJS= ccsd.o \
cnx_mgr.o \
@@ -44,7 +45,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *.o ${TARGET} *~
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/ccs/lib/Makefile 2007/12/21 09:15:14 1.11
+++ cluster/ccs/lib/Makefile 2007/12/21 20:13:43 1.12
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET=libccs.a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=libccs.a
+include $(OBJDIR)/make/clean.mk
OBJS= libccs.o \
log.o
@@ -42,5 +43,5 @@
${UNINSTALL} ${TARGET} ${libdir}
${UNINSTALL} ccs.h ${incdir}
-clean:
- rm -rf *~ *.o ${TARGET} ccs.h.gch log.c
+clean: generalclean
+ rm -rf ccs.h.gch log.c
--- cluster/ccs/man/Makefile 2007/12/21 18:37:15 1.6
+++ cluster/ccs/man/Makefile 2007/12/21 20:13:43 1.7
@@ -11,11 +11,11 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= cluster.conf.5 \
ccs.7 \
ccsd.8 \
ccs_test.8 \
ccs_tool.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/cman/cman_tool/Makefile 2007/12/21 09:15:14 1.27
+++ cluster/cman/cman_tool/Makefile 2007/12/21 20:13:43 1.28
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= cman_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=cman_tool
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
join.o
@@ -39,5 +40,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/cman/daemon/Makefile 2007/12/21 09:15:14 1.58
+++ cluster/cman/daemon/Makefile 2007/12/21 20:13:43 1.59
@@ -10,8 +10,11 @@
###############################################################################
###############################################################################
+TARGET= service_cman.lcrso
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
CFLAGS += -DOPENAIS_EXTERNAL_SERVICE
CFLAGS += -fPIC
@@ -20,8 +23,6 @@
LDFLAGS += -L${ccslibdir} -lccs
-TARGET= service_cman.lcrso
-
OBJS= daemon.o \
config.o \
logging.o \
@@ -45,5 +46,4 @@
uninstall:
rm -f ${libexecdir}/lcrso/${TARGET}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/cman/init.d/Makefile 2007/12/20 22:09:57 1.5
+++ cluster/cman/init.d/Makefile 2007/12/21 20:13:43 1.6
@@ -10,9 +10,9 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
+TARGETS= cman qdiskd
-TARGET= cman qdiskd
+include ../../make/defines.mk
all:
@@ -23,4 +23,4 @@
install $(S)/cman $(S)/qdiskd ${DESTDIR}/etc/init.d
uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
+ ${UNINSTALL} ${TARGETS} ${DESTDIR}/etc/init.d
--- cluster/cman/lib/Makefile 2007/12/21 09:15:14 1.13
+++ cluster/cman/lib/Makefile 2007/12/21 20:13:44 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET=libcman
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=libcman
+include $(OBJDIR)/make/clean.mk
SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
STATICLIB=$(TARGET).a
@@ -51,6 +52,4 @@
$(TARGET).so.$(RELEASE_MAJOR) \
${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-clean:
- rm -f *.o *.a *.so *.so.*
- rm -f *~
+clean: generalclean
--- cluster/cman/man/Makefile 2007/12/21 18:37:15 1.6
+++ cluster/cman/man/Makefile 2007/12/21 20:13:44 1.7
@@ -11,11 +11,11 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= cman.5 \
qdisk.5 \
cman_tool.8 \
qdiskd.8 \
mkqdisk.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/cman/qdisk/Makefile 2007/12/21 09:15:14 1.15
+++ cluster/cman/qdisk/Makefile 2007/12/21 20:13:44 1.16
@@ -10,8 +10,12 @@
###############################################################################
###############################################################################
+TARGET1= qdiskd
+TARGET2= mkqdisk
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
CFLAGS += -D_GNU_SOURCE
CFLAGS += -Werror -Wstrict-prototypes -Wshadow
@@ -22,9 +26,6 @@
EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs
EXTRA_LDFLAGS += -lpthread
-TARGET1= qdiskd
-TARGET2= mkqdisk
-
OBJS1= main.o \
score.o \
bitmap.o \
@@ -54,8 +55,7 @@
depends:
$(MAKE) -C ../lib all
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
+clean: generalclean
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/cman/tests/Makefile 2007/12/21 09:15:14 1.11
+++ cluster/cman/tests/Makefile 2007/12/21 20:13:44 1.12
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGETS= client libtest sysman sysmand
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGETS= client libtest sysman sysmand
+include $(OBJDIR)/make/clean.mk
CFLAGS += -I${cmanincdir}
CFLAGS += -I${incdir}
@@ -30,5 +31,4 @@
install: all
-clean:
- rm -f *.o ${TARGETS}
+clean: generalclean
--- cluster/dlm/lib/Makefile 2007/12/21 09:15:15 1.24
+++ cluster/dlm/lib/Makefile 2007/12/21 20:13:44 1.25
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET= libdlm
AISTARGET= libaislock
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
STATICLIB=$(TARGET).a $(TARGET)_lt.a
@@ -86,6 +87,4 @@
$(TARGET)_lt.so.$(RELEASE_MAJOR) \
${TARGET}_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-clean:
- rm -f *.o *.a *.so *.so.* *.po
- rm -f *~
+clean: generalclean
--- cluster/dlm/man/Makefile 2007/12/21 20:00:28 1.9
+++ cluster/dlm/man/Makefile 2007/12/21 20:13:44 1.10
@@ -10,9 +10,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= dlm_cleanup.3 \
dlm_close_lockspace.3 \
dlm_create_lockspace.3 \
@@ -34,3 +31,6 @@
dlm_unlock_wait.3 \
libdlm.3 \
dlm_tool.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/dlm/tests/usertest/Makefile 2007/12/21 09:15:15 1.15
+++ cluster/dlm/tests/usertest/Makefile 2007/12/21 20:13:45 1.16
@@ -10,11 +10,12 @@
###############################################################################
###############################################################################
+TARGETS= dlmtest asttest lstest pingtest lvb \
+ dlmtest2 flood alternate-lvb joinleave threads
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-
-TARGETS= dlmtest asttest lstest pingtest lvb dlmtest2 flood alternate-lvb joinleave threads
+include $(OBJDIR)/make/clean.mk
all: depends ${TARGETS}
@@ -29,5 +30,4 @@
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o ${TARGETS} *~ core
+clean: generalclean
--- cluster/dlm/tool/Makefile 2007/12/21 09:15:15 1.6
+++ cluster/dlm/tool/Makefile 2007/12/21 20:13:45 1.7
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= dlm_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= dlm_tool
+include $(OBJDIR)/make/clean.mk
OBJS= main.o
@@ -28,8 +29,7 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
install: all
install -d ${sbindir}
--- cluster/fence/agents/apc/Makefile 2007/12/21 09:11:17 1.8
+++ cluster/fence/agents/apc/Makefile 2007/12/21 20:13:45 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_apc
+include ../../../make/defines.mk
include $(OBJDIR)/make/fencepy.mk
--- cluster/fence/agents/baytech/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/baytech/Makefile 2007/12/21 20:13:45 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_baytech
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/bladecenter/Makefile 2007/12/21 09:11:15 1.8
+++ cluster/fence/agents/bladecenter/Makefile 2007/12/21 20:13:45 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_bladecenter
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/brocade/Makefile 2007/12/21 09:11:17 1.7
+++ cluster/fence/agents/brocade/Makefile 2007/12/21 20:13:45 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_brocade
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/bullpap/Makefile 2007/12/21 09:11:16 1.8
+++ cluster/fence/agents/bullpap/Makefile 2007/12/21 20:13:45 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_bullpap
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/cpint/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/cpint/Makefile 2007/12/21 20:13:46 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_cpint
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/drac/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/drac/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_drac
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/egenera/Makefile 2007/12/21 09:11:17 1.7
+++ cluster/fence/agents/egenera/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_egenera
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/ibmblade/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/ibmblade/Makefile 2007/12/21 20:13:46 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_ibmblade
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/ilo/Makefile 2007/12/21 09:11:15 1.7
+++ cluster/fence/agents/ilo/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_ilo
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/ipmilan/Makefile 2007/12/21 09:15:15 1.10
+++ cluster/fence/agents/ipmilan/Makefile 2007/12/21 20:13:46 1.11
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_ipmilan
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= fence_ipmilan
+include $(OBJDIR)/make/clean.mk
OBJS= expect.o \
ipmilan.o
@@ -35,5 +36,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/fence/agents/manual/Makefile 2007/12/20 22:09:58 1.12
+++ cluster/fence/agents/manual/Makefile 2007/12/21 20:13:46 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_ack_manual
+include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
+
all: ${TARGET}
# Using manual override instead of the binary version.
@@ -32,5 +33,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/fence/agents/mcdata/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/mcdata/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_mcdata
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/rackswitch/Makefile 2007/12/21 09:15:15 1.8
+++ cluster/fence/agents/rackswitch/Makefile 2007/12/21 20:13:46 1.9
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_rackswitch
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= fence_rackswitch
+include $(OBJDIR)/make/clean.mk
OBJS= do_rack.o
@@ -34,6 +35,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET} *~
-
+clean: generalclean
--- cluster/fence/agents/rps10/Makefile 2007/12/21 09:15:15 1.8
+++ cluster/fence/agents/rps10/Makefile 2007/12/21 20:13:47 1.9
@@ -11,8 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_rps10
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
TARGET= fence_rps10
@@ -34,5 +37,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/fence/agents/rsa/Makefile 2007/12/21 09:11:17 1.8
+++ cluster/fence/agents/rsa/Makefile 2007/12/21 20:13:47 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_rsa
+include ../../../make/defines.mk
include $(OBJDIR)/make/fencepy.mk
--- cluster/fence/agents/rsb/Makefile 2007/12/21 09:11:17 1.8
+++ cluster/fence/agents/rsb/Makefile 2007/12/21 20:13:47 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_rsb
+include ../../../make/defines.mk
include $(OBJDIR)/make/fencepy.mk
--- cluster/fence/agents/sanbox2/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/sanbox2/Makefile 2007/12/21 20:13:47 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_sanbox2
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/scsi/Makefile 2007/12/20 22:09:58 1.15
+++ cluster/fence/agents/scsi/Makefile 2007/12/21 20:13:47 1.16
@@ -10,11 +10,12 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_scsi
SCRIPT= scsi_reserve
+include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
+
all: $(TARGET) $(TARGET)_test
$(TARGET):
@@ -49,5 +50,4 @@
${UNINSTALL} ${TARGET} ${TARGET}_test ${sbindir}
${UNINSTALL} ${SCRIPT} ${DESTDIR}/etc/init.d
-clean:
- rm -f $(TARGET) $(TARGET)_test
+clean: generalclean
--- cluster/fence/agents/vixel/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/vixel/Makefile 2007/12/21 20:13:47 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_vixel
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/vmware/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/vmware/Makefile 2007/12/21 20:13:47 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_vmware
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/wti/Makefile 2007/12/21 09:11:17 1.7
+++ cluster/fence/agents/wti/Makefile 2007/12/21 20:13:47 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_wti
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/xcat/Makefile 2007/12/21 09:11:15 1.6
+++ cluster/fence/agents/xcat/Makefile 2007/12/21 20:13:47 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_xcat
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/xvm/Makefile 2007/12/21 09:15:15 1.17
+++ cluster/fence/agents/xvm/Makefile 2007/12/21 20:13:48 1.18
@@ -10,13 +10,14 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= fence_xvm
TARGET2= fence_xvmd
TARGET3= testprog
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= fence_xvm.o \
ip_lookup.o
@@ -61,8 +62,7 @@
${TARGET3}: ${OBJS3}
$(CC) -o $@ $^ $(XML_LDFLAGS)
-clean:
- rm -f ${TARGET1} ${TARGET2} ${TARGET3} *~ *.o
+clean: generalclean
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/agents/zvm/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/zvm/Makefile 2007/12/21 20:13:48 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_zvm
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/fence_node/Makefile 2007/12/21 09:15:15 1.12
+++ cluster/fence/fence_node/Makefile 2007/12/21 20:13:48 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET = fence_node
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET = fence_node
+include $(OBJDIR)/make/clean.mk
OBJS= ../fenced/agent.o \
fence_node.o
@@ -41,5 +42,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *~ *.o ${TARGET}
+clean: generalclean
--- cluster/fence/fence_tool/Makefile 2007/12/21 09:15:15 1.19
+++ cluster/fence/fence_tool/Makefile 2007/12/21 20:13:49 1.20
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET = fence_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET = fence_tool
+include $(OBJDIR)/make/clean.mk
OBJS= ../fenced/agent.o \
fence_tool.o
@@ -41,5 +42,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *~ *.o ${TARGET} agent.c
+clean: generalclean
--- cluster/fence/fenced/Makefile 2007/12/21 09:15:15 1.15
+++ cluster/fence/fenced/Makefile 2007/12/21 20:13:49 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET = fenced
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET = fenced
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
recover.o \
@@ -44,5 +45,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *~ *.o ${TARGET}
+clean: generalclean
--- cluster/fence/man/Makefile 2007/12/21 18:37:15 1.13
+++ cluster/fence/man/Makefile 2007/12/21 20:13:49 1.14
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= fence.8 \
fence_ack_manual.8 \
fence_apc.8 \
@@ -36,3 +33,6 @@
fence_xvm.8 \
fence_xvmd.8 \
fenced.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gfs/gfs_debug/Makefile 2007/12/21 09:15:16 1.12
+++ cluster/gfs/gfs_debug/Makefile 2007/12/21 20:13:49 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_debug
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_debug
+include $(OBJDIR)/make/clean.mk
OBJS= block_device.o \
basic.o \
@@ -42,7 +43,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
-
-
+clean: generalclean
--- cluster/gfs/gfs_edit/Makefile 2007/12/21 09:15:16 1.12
+++ cluster/gfs/gfs_edit/Makefile 2007/12/21 20:13:49 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_edit
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_edit
+include $(OBJDIR)/make/clean.mk
OBJS= gfshex.o \
hexedit.o
@@ -40,5 +41,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gfs/gfs_fsck/Makefile 2007/12/21 09:15:16 1.15
+++ cluster/gfs/gfs_fsck/Makefile 2007/12/21 20:13:49 1.16
@@ -10,12 +10,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gfs_fsck
TARGET2= fsck.gfs
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= bio.o \
bitmap.o \
block_list.o \
@@ -66,8 +67,8 @@
test_bitmap: bitmap.o test_bitmap.o log.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o *~ *.d ${TARGET1} ${TARGET2} cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
+clean: generalclean
+ rm -f test_block_list test_bitmap
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_grow/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/gfs_grow/Makefile 2007/12/21 20:13:49 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_grow
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_grow
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
ondisk.o
@@ -43,7 +44,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs/gfs_jadd/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/gfs_jadd/Makefile 2007/12/21 20:13:50 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_jadd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_jadd
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
ondisk.o
@@ -43,7 +44,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs/gfs_mkfs/Makefile 2007/12/21 09:15:16 1.14
+++ cluster/gfs/gfs_mkfs/Makefile 2007/12/21 20:13:50 1.15
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gfs_mkfs
TARGET2= mkfs.gfs
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= device_geometry.o \
fs_geometry.o \
locking.o \
@@ -53,7 +54,6 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
+clean: generalclean
.PHONY: all ${TARGET1}
--- cluster/gfs/gfs_quota/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/gfs_quota/Makefile 2007/12/21 20:13:50 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_quota
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_quota
+include $(OBJDIR)/make/clean.mk
OBJS= check.o \
main.o \
@@ -41,7 +42,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
-
-
+clean: generalclean
--- cluster/gfs/gfs_tool/Makefile 2007/12/21 09:15:16 1.17
+++ cluster/gfs/gfs_tool/Makefile 2007/12/21 20:13:50 1.18
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_tool
+include $(OBJDIR)/make/clean.mk
OBJS= counters.o \
df.o \
@@ -45,7 +46,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
-
-
+clean: generalclean
--- cluster/gfs/init.d/Makefile 2007/12/20 22:10:00 1.5
+++ cluster/gfs/init.d/Makefile 2007/12/21 20:13:50 1.6
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-
TARGET= gfs
+include ../../make/defines.mk
+
all:
clean:
--- cluster/gfs/libgfs/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/libgfs/Makefile 2007/12/21 20:13:50 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET=libgfs.a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=libgfs.a
+include $(OBJDIR)/make/clean.mk
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
@@ -49,7 +50,6 @@
uninstall:
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all
--- cluster/gfs/man/Makefile 2007/12/21 18:37:15 1.6
+++ cluster/gfs/man/Makefile 2007/12/21 20:13:50 1.7
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= gfs.8 \
gfs_mount.8 \
gfs_fsck.8 \
@@ -22,3 +19,6 @@
gfs_mkfs.8 \
gfs_quota.8 \
gfs_tool.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gfs/tests/filecon2/Makefile 2007/12/21 09:15:17 1.4
+++ cluster/gfs/tests/filecon2/Makefile 2007/12/21 20:13:51 1.5
@@ -13,6 +13,7 @@
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
TARGETS= filecon2_server filecon2_client
@@ -25,6 +26,4 @@
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o *.s *.a *~ core .depend $(TARGETS)
-
+clean: generalclean
--- cluster/gfs/tests/mmdd/Makefile 2007/08/29 02:51:38 1.2
+++ cluster/gfs/tests/mmdd/Makefile 2007/12/21 20:13:51 1.3
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
TARGETS= mmdd sfdd
@@ -28,5 +29,4 @@
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o *.s *.a *~ core .depend $(TARGETS)
+clean: generalclean
--- cluster/gfs-kernel/src/gfs/Makefile 2007/12/21 09:05:34 1.18
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/12/21 20:13:51 1.19
@@ -13,6 +13,7 @@
ifndef USING_KBUILD
include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
endif
PWD := $(shell pwd)
@@ -72,9 +73,6 @@
${UNINSTALL} gfs.ko ${module_dir}/fs/gfs
${UNINSTALL} gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-clean:
- rm -rf linux *.o .*.o.cmd .gfs.ko.cmd \
- gfs.ko gfs.mod.c .tmp_versions *~ *~* \
- Module.symvers .*.o.d
+clean: generalclean
distclean: clean
--- cluster/gfs2/convert/Makefile 2007/12/21 09:15:17 1.14
+++ cluster/gfs2/convert/Makefile 2007/12/21 20:13:51 1.15
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_convert
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_convert
+include $(OBJDIR)/make/clean.mk
OBJS= gfs2_convert.o
@@ -41,7 +42,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/edit/Makefile 2007/12/21 09:15:17 1.14
+++ cluster/gfs2/edit/Makefile 2007/12/21 20:13:51 1.15
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_edit
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_edit
+include $(OBJDIR)/make/clean.mk
OBJS= gfs2hex.o \
savemeta.o \
@@ -46,7 +47,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/fsck/Makefile 2007/12/21 09:15:17 1.18
+++ cluster/gfs2/fsck/Makefile 2007/12/21 20:13:51 1.19
@@ -10,12 +10,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= fsck.gfs2
TARGET2= gfs2_fsck
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= eattr.o \
fs_recovery.o \
hash.o \
@@ -60,8 +61,8 @@
test_bitmap: test_bitmap.o log.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f ${TARGET1} ${TARGET2} *.o *~ *.d cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
+clean: generalclean
+ rm -f test_block_list test_bitmap
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs2/init.d/Makefile 2007/12/20 22:10:01 1.5
+++ cluster/gfs2/init.d/Makefile 2007/12/21 20:13:51 1.6
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-
TARGET= gfs2
+include ../../make/defines.mk
+
all:
clean:
--- cluster/gfs2/libgfs2/Makefile 2007/12/21 09:15:17 1.15
+++ cluster/gfs2/libgfs2/Makefile 2007/12/21 20:13:51 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= libgfs2.a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= libgfs2.a
+include $(OBJDIR)/make/clean.mk
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
@@ -48,7 +49,6 @@
uninstall:
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all
--- cluster/gfs2/man/Makefile 2007/12/21 18:37:16 1.6
+++ cluster/gfs2/man/Makefile 2007/12/21 20:13:51 1.7
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= gfs2.8 \
gfs2_convert.8 \
gfs2_edit.8 \
@@ -24,3 +21,6 @@
gfs2_quota.8 \
gfs2_tool.8 \
mkfs.gfs2.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gfs2/mkfs/Makefile 2007/12/21 09:15:18 1.23
+++ cluster/gfs2/mkfs/Makefile 2007/12/21 20:13:51 1.24
@@ -3,14 +3,15 @@
#
.PHONY: all clean install
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= mkfs.gfs2
TARGET2= gfs2_mkfs
TARGET3= gfs2_jadd
TARGET4= gfs2_grow
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= main.o \
main_mkfs.o \
main_grow.o \
@@ -51,7 +52,6 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+clean: generalclean
.PHONY: all ${TARGET1}
--- cluster/gfs2/mount/Makefile 2007/12/21 09:15:18 1.21
+++ cluster/gfs2/mount/Makefile 2007/12/21 20:13:52 1.22
@@ -10,12 +10,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= mount.gfs2
TARGET2= umount.gfs2
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= mount.gfs2.o
OBJS2= umount.gfs2.o
@@ -45,6 +46,4 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${DESTDIR}/sbin
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
-
+clean: generalclean
--- cluster/gfs2/quota/Makefile 2007/12/21 09:15:18 1.15
+++ cluster/gfs2/quota/Makefile 2007/12/21 20:13:52 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_quota
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_quota
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
names.o \
@@ -41,7 +42,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/tool/Makefile 2007/12/21 09:15:18 1.17
+++ cluster/gfs2/tool/Makefile 2007/12/21 20:13:52 1.18
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_tool
+include $(OBJDIR)/make/clean.mk
OBJS= counters.o \
df.o \
@@ -49,7 +50,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f ${TARGET} *.o *~ *.d cscope.* *.orig *.rej
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gnbd/client/Makefile 2007/12/21 09:15:18 1.17
+++ cluster/gnbd/client/Makefile 2007/12/21 20:13:52 1.18
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gnbd_recvd
TARGET2= gnbd_monitor
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= gnbd_recvd.o
OBJS2= gnbd_monitor.o \
@@ -50,5 +51,4 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-clean:
- rm -f *.o *~ ${TARGET1} ${TARGET2}
+clean: generalclean
--- cluster/gnbd/man/Makefile 2007/12/21 18:37:16 1.6
+++ cluster/gnbd/man/Makefile 2007/12/21 20:13:52 1.7
@@ -11,11 +11,11 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= gnbd.8 \
gnbd_export.8 \
gnbd_import.8 \
gnbd_serv.8 \
fence_gnbd.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gnbd/server/Makefile 2007/12/21 09:15:18 1.17
+++ cluster/gnbd/server/Makefile 2007/12/21 20:13:52 1.18
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gnbd_serv
TARGET2= gnbd_clusterd
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= gnbd_serv.o \
local_req.o \
extern_req.o \
@@ -55,5 +56,4 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
+clean: generalclean
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/21 09:15:18 1.8
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/21 20:13:52 1.9
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_gnbd
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= fence_gnbd
+include $(OBJDIR)/make/clean.mk
OBJS= main.o
@@ -35,5 +36,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/21 09:15:18 1.18
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/21 20:13:52 1.19
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gnbd_export
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gnbd_export
+include $(OBJDIR)/make/clean.mk
OBJS= gnbd_export.o \
../../utils/gnbd_utils.o \
@@ -42,5 +43,4 @@
uninstall:
${UNINSTALL} ${TARGET} gnbd_get_uid ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/21 09:15:19 1.15
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/21 20:13:52 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gnbd_import
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gnbd_import
+include $(OBJDIR)/make/clean.mk
OBJS= gnbd_import.o \
../../utils/gnbd_utils.o \
@@ -42,5 +43,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gnbd/utils/Makefile 2007/12/21 09:15:19 1.3
+++ cluster/gnbd/utils/Makefile 2007/12/21 20:13:53 1.4
@@ -13,6 +13,7 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
SHAREDOBJS= member_cman.o \
trans.o \
@@ -27,5 +28,4 @@
uninstall:
-clean:
- rm -f *.o *~
+clean: generalclean
--- cluster/gnbd-kernel/src/Makefile 2007/12/21 09:05:34 1.8
+++ cluster/gnbd-kernel/src/Makefile 2007/12/21 20:13:53 1.9
@@ -13,6 +13,7 @@
ifndef USING_KBUILD
include ../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
endif
PWD = $(shell pwd)
@@ -34,9 +35,6 @@
${UNINSTALL} gnbd.ko ${module_dir}/drivers/block/gnbd
${UNINSTALL} gnbd.h ${incdir}/linux
-clean:
- rm -rf linux *.mod.c .gnbd.ko.cmd \
- .tmp_versions *o .*.o.cmd *~ \
- Module.symvers .*.o.d
+clean: generalclean
distclean: clean
--- cluster/group/daemon/Makefile 2007/12/21 09:15:19 1.23
+++ cluster/group/daemon/Makefile 2007/12/21 20:13:53 1.24
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= groupd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= groupd
+include $(OBJDIR)/make/clean.mk
OBJS= app.o \
cpg.o \
--- cluster/group/dlm_controld/Makefile 2007/12/21 09:15:19 1.14
+++ cluster/group/dlm_controld/Makefile 2007/12/21 20:13:53 1.15
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= dlm_controld
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= dlm_controld
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
member_cman.o \
@@ -45,7 +46,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/group/gfs_controld/Makefile 2007/12/21 09:15:19 1.16
+++ cluster/group/gfs_controld/Makefile 2007/12/21 20:13:53 1.17
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_controld
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_controld
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
member_cman.o \
@@ -47,7 +48,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/group/lib/Makefile 2007/12/21 09:15:19 1.10
+++ cluster/group/lib/Makefile 2007/12/21 20:13:54 1.11
@@ -10,10 +10,12 @@
###############################################################################
###############################################################################
+TARGET=libgroup
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
-TARGET=libgroup
STATICLIB=$(TARGET).a
CFLAGS += -fPIC
@@ -30,6 +32,4 @@
uninstall:
-clean:
- rm -f *.o *.a *.so *.so.*
- rm -f *~
+clean: generalclean
--- cluster/group/man/Makefile 2007/12/21 18:37:16 1.3
+++ cluster/group/man/Makefile 2007/12/21 20:13:54 1.4
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= dlm_controld.8 \
gfs_controld.8 \
group_tool.8 \
groupd.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/group/test/Makefile 2007/12/21 09:15:20 1.5
+++ cluster/group/test/Makefile 2007/12/21 20:13:54 1.6
@@ -10,16 +10,15 @@
###############################################################################
###############################################################################
+TARGETS= client clientd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGETS= client clientd
+include $(OBJDIR)/make/clean.mk
all: $(TARGETS)
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o $(TARGETS)
-
+clean: generalclean
--- cluster/group/tool/Makefile 2007/12/21 09:15:20 1.13
+++ cluster/group/tool/Makefile 2007/12/21 20:13:54 1.14
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= group_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= group_tool
+include $(OBJDIR)/make/clean.mk
OBJS= main.o
@@ -30,8 +31,7 @@
depends:
$(MAKE) -C ../lib all
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
install: all
install -d ${sbindir}
/cvs/cluster/cluster/make/clean.mk,v --> standard output
revision 1.1
--- cluster/make/clean.mk
+++ - 2007-12-21 20:14:05.741767000 +0000
@@ -0,0 +1,6 @@
+generalclean:
+ rm -rf *~* *.o *.a *.so *.so.* a.out *.po *.s *.d
+ rm -rf core .depend cscope.* *.orig *.rej
+ rm -rf linux .*.o.cmd .*.ko.cmd *.mod.c .tmp_versions Module.symvers .*.o.d
+ rm -rf ${TARGET} ${TARGETS} ${TARGET}_test
+ rm -rf ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
--- cluster/make/fenceperl.mk 2007/12/20 22:10:04 1.2
+++ cluster/make/fenceperl.mk 2007/12/21 20:13:54 1.3
@@ -1,15 +1,4 @@
-###############################################################################
-###############################################################################
-##
-## Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
-##
-## This copyrighted material is made available to anyone wishing to use,
-## modify, copy, or redistribute it subject to the terms and conditions
-## of the GNU General Public License v.2.
-##
-###############################################################################
-###############################################################################
+include $(OBJDIR)/make/clean.mk
all: $(TARGET)
@@ -31,5 +20,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f $(TARGET)
+clean: generalclean
--- cluster/make/fencepy.mk 2007/12/20 22:10:04 1.2
+++ cluster/make/fencepy.mk 2007/12/21 20:13:54 1.3
@@ -1,3 +1,5 @@
+include $(OBJDIR)/make/clean.mk
+
all: $(TARGET)
$(TARGET):
@@ -18,5 +20,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f $(TARGET)
+clean: generalclean
--- cluster/rgmanager/init.d/Makefile 2007/12/20 22:10:04 1.4
+++ cluster/rgmanager/init.d/Makefile 2007/12/21 20:13:55 1.5
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-
TARGET= rgmanager
+include ../../make/defines.mk
+
all:
clean:
--- cluster/rgmanager/man/Makefile 2007/12/21 18:37:16 1.8
+++ cluster/rgmanager/man/Makefile 2007/12/21 20:13:55 1.9
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= clubufflush.8 \
clufindhostname.8 \
clulog.8 \
@@ -22,4 +19,7 @@
clustat.8 \
clusvcadm.8
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
+
check:
--- cluster/rgmanager/src/clulib/Makefile 2007/12/21 09:15:21 1.21
+++ cluster/rgmanager/src/clulib/Makefile 2007/12/21 20:13:55 1.22
@@ -10,13 +10,14 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= libclulib.a
TARGET2= liblalloc.a
TARGET3= msgtest
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= clulog.o daemon_init.o signals.o msgsimple.o \
gettid.o rg_strings.o message.o members.o fdops.o \
lock.o cman.o vft.o msg_cluster.o msg_socket.o \
@@ -52,5 +53,4 @@
${TARGET3}: ${OBJS3} ${TARGET1}
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3}
+clean: generalclean
--- cluster/rgmanager/src/daemons/Makefile 2007/12/21 09:15:21 1.28
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/21 20:13:55 1.29
@@ -10,14 +10,15 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= clurgmgrd
TARGET2= clurmtabd
TARGET3= rg_test
TARGET4= dtest
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= depends.o \
fo_domain.o \
groups.o \
@@ -121,8 +122,7 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+clean: generalclean
rm -f tests/*.out*
.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
--- cluster/rgmanager/src/utils/Makefile 2007/12/21 09:15:21 1.21
+++ cluster/rgmanager/src/utils/Makefile 2007/12/21 20:13:55 1.22
@@ -10,9 +10,6 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= clubufflush
TARGET2= clufindhostname
TARGET3= clustat
@@ -20,6 +17,10 @@
TARGET5= clulog
TARGET6= clunfslock
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
DISABLEDTARGETS= cluarp
CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
@@ -62,7 +63,6 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
+clean: generalclean
.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
@ 2007-12-22 12:46 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-12-22 12:46 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-12-22 12:46:31
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/init.d : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
dlm/lib : Makefile
dlm/tool : Makefile
fence/agents/ipmilan: Makefile
fence/agents/manual: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/scsi: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/init.d : Makefile
gfs/libgfs : Makefile
gfs-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/init.d : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
gnbd/utils : Makefile
gnbd-kernel/src: Makefile
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/tool : Makefile
make : fenceperl.mk fencepy.mk
rgmanager/init.d: Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/resources: Makefile
rgmanager/src/utils: Makefile
Added files:
make : install.mk uninstall.mk
Log message:
Collapse all install: and uninstall: targets in make/install.mk make/uninstall.mk
Change almost all Makefile's to use them.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.59&r2=1.60
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/install.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/uninstall.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fenceperl.mk.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fencepy.mk.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
--- cluster/ccs/ccs_test/Makefile 2007/12/21 20:13:43 1.12
+++ cluster/ccs/ccs_test/Makefile 2007/12/22 12:46:24 1.13
@@ -12,9 +12,13 @@
TARGET= ccs_test
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= ccs_test.o
@@ -32,13 +36,6 @@
depends:
$(MAKE) -C ../lib all
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/ccs/ccs_tool/Makefile 2007/12/21 20:13:43 1.18
+++ cluster/ccs/ccs_tool/Makefile 2007/12/22 12:46:24 1.19
@@ -12,9 +12,13 @@
TARGET= ccs_tool
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= ccs_tool.o \
update.o \
@@ -38,13 +42,6 @@
depends:
$(MAKE) -C ../lib all
-install: all
- install -d ${sbindir}
- install ccs_tool ${sbindir}
-
-uninstall:
- ${UNINSTALL} ccs_tool ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/ccs/daemon/Makefile 2007/12/21 20:13:43 1.20
+++ cluster/ccs/daemon/Makefile 2007/12/22 12:46:24 1.21
@@ -12,9 +12,13 @@
TARGET= ccsd
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= ccsd.o \
cnx_mgr.o \
@@ -38,13 +42,6 @@
depends:
$(MAKE) -C ../lib all
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/ccs/lib/Makefile 2007/12/21 20:13:43 1.12
+++ cluster/ccs/lib/Makefile 2007/12/22 12:46:24 1.13
@@ -10,11 +10,16 @@
###############################################################################
###############################################################################
-TARGET=libccs.a
+TARGET= libccs.a
+
+LIBDIRT=$(TARGET)
+INCDIRT=ccs.h
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= libccs.o \
log.o
@@ -33,15 +38,5 @@
log.c:
ln -sf $(S)/../common/log.c log.c
-install: all
- install -d ${libdir}
- install -m644 ${TARGET} ${libdir}
- install -d ${incdir}
- install -m644 $(S)/ccs.h ${incdir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${libdir}
- ${UNINSTALL} ccs.h ${incdir}
-
clean: generalclean
rm -rf ccs.h.gch log.c
--- cluster/cman/cman_tool/Makefile 2007/12/21 20:13:43 1.28
+++ cluster/cman/cman_tool/Makefile 2007/12/22 12:46:24 1.29
@@ -12,9 +12,13 @@
TARGET= cman_tool
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
join.o
@@ -33,11 +37,4 @@
depends:
$(MAKE) -C ../lib all
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/cman/daemon/Makefile 2007/12/21 20:13:43 1.59
+++ cluster/cman/daemon/Makefile 2007/12/22 12:46:24 1.60
@@ -12,9 +12,13 @@
TARGET= service_cman.lcrso
+LCRSOT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
CFLAGS += -DOPENAIS_EXTERNAL_SERVICE
CFLAGS += -fPIC
@@ -39,11 +43,4 @@
depends:
$(MAKE) -C ../lib all
-install: all
- install -d ${libexecdir}/lcrso
- install ${TARGET} ${libexecdir}/lcrso
-
-uninstall:
- rm -f ${libexecdir}/lcrso/${TARGET}
-
clean: generalclean
--- cluster/cman/init.d/Makefile 2007/12/21 20:13:43 1.6
+++ cluster/cman/init.d/Makefile 2007/12/22 12:46:25 1.7
@@ -12,15 +12,12 @@
TARGETS= cman qdiskd
+INITDT=$(TARGETS)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all:
clean:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/cman $(S)/qdiskd ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGETS} ${DESTDIR}/etc/init.d
--- cluster/cman/lib/Makefile 2007/12/21 20:13:44 1.14
+++ cluster/cman/lib/Makefile 2007/12/22 12:46:25 1.15
@@ -11,11 +11,21 @@
###############################################################################
###############################################################################
-TARGET=libcman
+TARGET= libcman
+
+LIBDIRT=$(TARGET).a \
+ $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
+
+LIBSYMT=$(TARGET).so \
+ $(TARGET).so.$(RELEASE_MAJOR)
+
+INCDIRT=$(TARGET).h
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
STATICLIB=$(TARGET).a
@@ -35,21 +45,4 @@
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so.$(RELEASE_MAJOR)
-install: all
- install -d ${incdir}
- install $(S)/$(TARGET).h ${incdir}
- install -d ${libdir}
- install $(TARGET).a ${libdir}
- install $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so.$(RELEASE_MAJOR)
-
-uninstall:
- ${UNINSTALL} $(TARGET).h ${incdir}
- ${UNINSTALL} \
- ${TARGET}.a \
- $(TARGET).so \
- $(TARGET).so.$(RELEASE_MAJOR) \
- ${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-
clean: generalclean
--- cluster/cman/qdisk/Makefile 2007/12/21 20:13:44 1.16
+++ cluster/cman/qdisk/Makefile 2007/12/22 12:46:25 1.17
@@ -13,9 +13,13 @@
TARGET1= qdiskd
TARGET2= mkqdisk
+SBINDIRT=${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
CFLAGS += -D_GNU_SOURCE
CFLAGS += -Werror -Wstrict-prototypes -Wshadow
@@ -48,14 +52,7 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- install -d ${sbindir}
- install ${TARGET1} ${TARGET2} ${sbindir}
-
depends:
$(MAKE) -C ../lib all
clean: generalclean
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/dlm/lib/Makefile 2007/12/21 20:13:44 1.25
+++ cluster/dlm/lib/Makefile 2007/12/22 12:46:25 1.26
@@ -12,11 +12,28 @@
###############################################################################
TARGET= libdlm
-AISTARGET= libaislock
+
+LIBDIRT=$(TARGET).a \
+ $(TARGET)_lt.a \
+ $(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} \
+ $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+
+LIBSYMT=$(TARGET).so \
+ $(TARGET)_lt.so \
+ $(TARGET).so.$(RELEASE_MAJOR) \
+ $(TARGET)_lt.so.$(RELEASE_MAJOR)
+
+INCDIRT=$(TARGET).h
+
+UDEVT=../scripts/51-dlm.rules
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
+
+AISTARGET= libaislock
SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
STATICLIB=$(TARGET).a $(TARGET)_lt.a
@@ -59,32 +76,4 @@
%.po: $(S)/%.c
$(CC) $(CFLAGS) -fPIC -D_REENTRANT -c -o $@ $<
-install: all
- install -d ${incdir}
- install -m644 $(S)/$(TARGET).h ${incdir}
- install -d ${libdir}
- install -d ${DESTDIR}/etc/udev/rules.d
- install -m644 $(S)/../scripts/51-dlm.rules ${DESTDIR}/etc/udev/rules.d
- install $(TARGET).a ${libdir}
- install $(TARGET)_lt.a ${libdir}
- install $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
- install $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so.$(RELEASE_MAJOR)
- ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET)_lt.so
- ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET)_lt.so.$(RELEASE_MAJOR)
-
-uninstall:
- ${UNINSTALL} $(TARGET).h ${incdir}
- ${UNINSTALL} 51-dlm.rules ${DESTDIR}/etc/udev/rules.d
- ${UNINSTALL} \
- ${TARGET}.a \
- ${TARGET}_lt.a \
- $(TARGET).so \
- $(TARGET)_lt.so \
- $(TARGET).so.$(RELEASE_MAJOR) \
- ${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) \
- $(TARGET)_lt.so.$(RELEASE_MAJOR) \
- ${TARGET}_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-
clean: generalclean
--- cluster/dlm/tool/Makefile 2007/12/21 20:13:45 1.7
+++ cluster/dlm/tool/Makefile 2007/12/22 12:46:25 1.8
@@ -12,9 +12,13 @@
TARGET= dlm_tool
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o
@@ -30,10 +34,3 @@
$(CC) -o $@ $^ $(LDFLAGS)
clean: generalclean
-
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
--- cluster/fence/agents/ipmilan/Makefile 2007/12/21 20:13:46 1.11
+++ cluster/fence/agents/ipmilan/Makefile 2007/12/22 12:46:25 1.12
@@ -13,9 +13,13 @@
TARGET= fence_ipmilan
+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= expect.o \
ipmilan.o
@@ -27,13 +31,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/agents/manual/Makefile 2007/12/21 20:13:46 1.13
+++ cluster/fence/agents/manual/Makefile 2007/12/22 12:46:25 1.14
@@ -13,24 +13,19 @@
TARGET= fence_ack_manual
+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all: ${TARGET}
# Using manual override instead of the binary version.
# (this version does not require any configuration params
# in cluster.conf, but fencing must fail first)
-fence_ack_manual: $(S)/fence_ack_manual.sh
- cp $< $@
-
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
+${TARGET}:
+ cp $(S)/$@.sh $@
clean: generalclean
--- cluster/fence/agents/rackswitch/Makefile 2007/12/21 20:13:46 1.9
+++ cluster/fence/agents/rackswitch/Makefile 2007/12/22 12:46:26 1.10
@@ -13,9 +13,13 @@
TARGET= fence_rackswitch
+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= do_rack.o
@@ -26,13 +30,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/agents/rps10/Makefile 2007/12/21 20:13:47 1.9
+++ cluster/fence/agents/rps10/Makefile 2007/12/22 12:46:26 1.10
@@ -13,9 +13,13 @@
TARGET= fence_rps10
+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
TARGET= fence_rps10
@@ -28,13 +32,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/agents/scsi/Makefile 2007/12/21 20:13:47 1.16
+++ cluster/fence/agents/scsi/Makefile 2007/12/22 12:46:26 1.17
@@ -11,10 +11,14 @@
###############################################################################
TARGET= fence_scsi
-SCRIPT= scsi_reserve
+
+SBINDIRT=$(TARGET) $(TARGET)_test
+INITDT= scsi_reserve
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all: $(TARGET) $(TARGET)_test
@@ -36,18 +40,4 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET)_test.pl >> $(TARGET)_test
chmod +x $(TARGET)_test
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${TARGET}_test ${sbindir}
- if [ ! -d ${DESTDIR}/etc/init.d ]; then \
- install -d ${DESTDIR}/etc/init.d; \
- fi
- install -m755 $(S)/${SCRIPT} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${TARGET}_test ${sbindir}
- ${UNINSTALL} ${SCRIPT} ${DESTDIR}/etc/init.d
-
clean: generalclean
--- cluster/fence/agents/xvm/Makefile 2007/12/21 20:13:48 1.18
+++ cluster/fence/agents/xvm/Makefile 2007/12/22 12:46:26 1.19
@@ -14,9 +14,13 @@
TARGET2= fence_xvmd
TARGET3= testprog
+SBINDIRT=$(TARGET1) $(TARGET2)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS1= fence_xvm.o \
ip_lookup.o
@@ -63,12 +67,3 @@
$(CC) -o $@ $^ $(XML_LDFLAGS)
clean: generalclean
-
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET1} ${TARGET2} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/fence/fence_node/Makefile 2007/12/21 20:13:48 1.13
+++ cluster/fence/fence_node/Makefile 2007/12/22 12:46:26 1.14
@@ -13,9 +13,13 @@
TARGET = fence_node
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= ../fenced/agent.o \
fence_node.o
@@ -33,13 +37,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/fence_tool/Makefile 2007/12/21 20:13:49 1.20
+++ cluster/fence/fence_tool/Makefile 2007/12/22 12:46:26 1.21
@@ -13,9 +13,13 @@
TARGET = fence_tool
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= ../fenced/agent.o \
fence_tool.o
@@ -33,13 +37,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/fenced/Makefile 2007/12/21 20:13:49 1.16
+++ cluster/fence/fenced/Makefile 2007/12/22 12:46:26 1.17
@@ -13,9 +13,13 @@
TARGET = fenced
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
recover.o \
@@ -36,13 +40,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_debug/Makefile 2007/12/21 20:13:49 1.13
+++ cluster/gfs/gfs_debug/Makefile 2007/12/22 12:46:26 1.14
@@ -13,9 +13,13 @@
TARGET= gfs_debug
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= block_device.o \
basic.o \
@@ -34,13 +38,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_edit/Makefile 2007/12/21 20:13:49 1.13
+++ cluster/gfs/gfs_edit/Makefile 2007/12/22 12:46:26 1.14
@@ -13,9 +13,13 @@
TARGET= gfs_edit
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= gfshex.o \
hexedit.o
@@ -32,13 +36,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_fsck/Makefile 2007/12/21 20:13:49 1.16
+++ cluster/gfs/gfs_fsck/Makefile 2007/12/22 12:46:27 1.17
@@ -13,9 +13,14 @@
TARGET1= gfs_fsck
TARGET2= fsck.gfs
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= bio.o \
bitmap.o \
@@ -70,16 +75,6 @@
clean: generalclean
rm -f test_block_list test_bitmap
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET1} ${sbindir}
- cd ${sbindir}; ln -sf ${TARGET1} ${TARGET2}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
${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 \
--- cluster/gfs/gfs_grow/Makefile 2007/12/21 20:13:49 1.14
+++ cluster/gfs/gfs_grow/Makefile 2007/12/22 12:46:27 1.15
@@ -13,9 +13,13 @@
TARGET= gfs_grow
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
ondisk.o
@@ -35,15 +39,6 @@
depends:
$(MAKE) -C ../libgfs all
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs/gfs_jadd/Makefile 2007/12/21 20:13:50 1.14
+++ cluster/gfs/gfs_jadd/Makefile 2007/12/22 12:46:27 1.15
@@ -13,9 +13,13 @@
TARGET= gfs_jadd
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
ondisk.o
@@ -35,15 +39,6 @@
depends:
$(MAKE) -C ../libgfs all
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs/gfs_mkfs/Makefile 2007/12/21 20:13:50 1.15
+++ cluster/gfs/gfs_mkfs/Makefile 2007/12/22 12:46:27 1.16
@@ -14,9 +14,14 @@
TARGET1= gfs_mkfs
TARGET2= mkfs.gfs
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= device_geometry.o \
fs_geometry.o \
@@ -44,16 +49,6 @@
depends:
$(MAKE) -C ../libgfs all
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET1} ${sbindir}
- ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET1}
--- cluster/gfs/gfs_quota/Makefile 2007/12/21 20:13:50 1.14
+++ cluster/gfs/gfs_quota/Makefile 2007/12/22 12:46:27 1.15
@@ -13,9 +13,13 @@
TARGET= gfs_quota
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= check.o \
main.o \
@@ -33,13 +37,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_tool/Makefile 2007/12/21 20:13:50 1.18
+++ cluster/gfs/gfs_tool/Makefile 2007/12/22 12:46:27 1.19
@@ -13,9 +13,13 @@
TARGET= gfs_tool
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= counters.o \
df.o \
@@ -37,13 +41,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/init.d/Makefile 2007/12/21 20:13:50 1.6
+++ cluster/gfs/init.d/Makefile 2007/12/22 12:46:27 1.7
@@ -12,15 +12,12 @@
TARGET= gfs
+INITDT=$(TARGET)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all:
clean:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/gfs/libgfs/Makefile 2007/12/21 20:13:50 1.14
+++ cluster/gfs/libgfs/Makefile 2007/12/22 12:46:27 1.15
@@ -16,6 +16,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
@@ -46,10 +48,6 @@
${AR} cru $@ $^
${RANLIB} $@
-install: all
-
-uninstall:
-
clean: generalclean
.PHONY: all
--- cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 05:10:49 1.20
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 12:46:27 1.21
@@ -11,9 +11,17 @@
###############################################################################
###############################################################################
+TARGET= gfs.ko
+
+KMODT=$(TARGET)
+KDIRT=fs/gfs
+KHEADT=gfs_ondisk.h gfs_ioctl.h
+
ifndef USING_KBUILD
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
endif
PWD := $(shell pwd)
@@ -63,14 +71,4 @@
all:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes
-install: all
- install -d ${module_dir}/fs/gfs
- install gfs.ko ${module_dir}/fs/gfs
- install -d ${incdir}/linux
- install gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-
-uninstall:
- ${UNINSTALL} gfs.ko ${module_dir}/fs/gfs
- ${UNINSTALL} gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-
clean: generalclean
--- cluster/gfs2/convert/Makefile 2007/12/21 20:13:51 1.15
+++ cluster/gfs2/convert/Makefile 2007/12/22 12:46:28 1.16
@@ -12,9 +12,13 @@
TARGET= gfs2_convert
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= gfs2_convert.o
@@ -33,15 +37,6 @@
depends:
$(MAKE) -C ../libgfs2 all
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/edit/Makefile 2007/12/21 20:13:51 1.15
+++ cluster/gfs2/edit/Makefile 2007/12/22 12:46:28 1.16
@@ -13,9 +13,13 @@
TARGET= gfs2_edit
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= gfs2hex.o \
savemeta.o \
@@ -38,15 +42,6 @@
depends:
$(MAKE) -C ../libgfs2 all
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/fsck/Makefile 2007/12/21 20:13:51 1.19
+++ cluster/gfs2/fsck/Makefile 2007/12/22 12:46:28 1.20
@@ -13,9 +13,14 @@
TARGET1= fsck.gfs2
TARGET2= gfs2_fsck
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= eattr.o \
fs_recovery.o \
@@ -64,16 +69,6 @@
clean: generalclean
rm -f test_block_list test_bitmap
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET1} ${sbindir}
- cd ${sbindir}; ln -sf ${TARGET1} ${TARGET2}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
${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 \
--- cluster/gfs2/init.d/Makefile 2007/12/21 20:13:51 1.6
+++ cluster/gfs2/init.d/Makefile 2007/12/22 12:46:28 1.7
@@ -12,15 +12,12 @@
TARGET= gfs2
+INITDT=$(TARGET)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all:
clean:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/gfs2/libgfs2/Makefile 2007/12/21 20:13:51 1.16
+++ cluster/gfs2/libgfs2/Makefile 2007/12/22 12:46:28 1.17
@@ -16,6 +16,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
@@ -45,10 +47,6 @@
${AR} cru $@ $^
${RANLIB} $@
-install: all
-
-uninstall:
-
clean: generalclean
.PHONY: all
--- cluster/gfs2/mkfs/Makefile 2007/12/21 20:13:51 1.24
+++ cluster/gfs2/mkfs/Makefile 2007/12/22 12:46:28 1.25
@@ -8,9 +8,14 @@
TARGET3= gfs2_jadd
TARGET4= gfs2_grow
+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2) $(TARGET3) $(TARGET4)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
main_mkfs.o \
@@ -42,16 +47,6 @@
depends:
$(MAKE) -C ../libgfs2 all
-install: all
- install -m 0755 ${TARGET1} ${sbindir}
- cd ${sbindir}; \
- ln -sf ${TARGET1} ${TARGET2}; \
- ln -sf ${TARGET1} ${TARGET3}; \
- ln -sf ${TARGET1} ${TARGET4}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET1}
--- cluster/gfs2/quota/Makefile 2007/12/21 20:13:52 1.16
+++ cluster/gfs2/quota/Makefile 2007/12/22 12:46:28 1.17
@@ -13,9 +13,13 @@
TARGET= gfs2_quota
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
names.o \
@@ -36,12 +40,6 @@
depends:
$(MAKE) -C ../libgfs2 all
-install: all
- install -m 0755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/tool/Makefile 2007/12/21 20:13:52 1.18
+++ cluster/gfs2/tool/Makefile 2007/12/22 12:46:28 1.19
@@ -13,9 +13,13 @@
TARGET= gfs2_tool
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= counters.o \
df.o \
@@ -41,15 +45,6 @@
depends:
$(MAKE) -C ../libgfs2 all
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gnbd/client/Makefile 2007/12/21 20:13:52 1.18
+++ cluster/gnbd/client/Makefile 2007/12/22 12:46:28 1.19
@@ -14,9 +14,13 @@
TARGET1= gnbd_recvd
TARGET2= gnbd_monitor
+SBINDIRT=$(TARGET1) $(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS1= gnbd_recvd.o
@@ -41,14 +45,4 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET1} ${sbindir}
- install -m755 ${TARGET2} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/server/Makefile 2007/12/21 20:13:52 1.18
+++ cluster/gnbd/server/Makefile 2007/12/22 12:46:29 1.19
@@ -14,9 +14,13 @@
TARGET1= gnbd_serv
TARGET2= gnbd_clusterd
+SBINDIRT=$(TARGET1) $(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS1= gnbd_serv.o \
local_req.o \
@@ -46,14 +50,4 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET1} ${sbindir}
- install -m755 ${TARGET2} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/21 20:13:52 1.9
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/22 12:46:29 1.10
@@ -13,9 +13,13 @@
TARGET= fence_gnbd
+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o
@@ -27,13 +31,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/21 20:13:52 1.19
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 12:46:29 1.20
@@ -13,9 +13,13 @@
TARGET= gnbd_export
+SBINDIRT=$(TARGET) gnbd_get_uid
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= gnbd_export.o \
../../utils/gnbd_utils.o \
@@ -28,19 +32,12 @@
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-all: ${TARGET}
+all: ${TARGET} gnbd_get_uid
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
- install -m755 $(S)/gnbd_get_uid ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} gnbd_get_uid ${sbindir}
+gnbd_get_uid:
+ cp $(S)/$@ $@
clean: generalclean
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/21 20:13:52 1.16
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 12:46:29 1.17
@@ -13,9 +13,13 @@
TARGET= gnbd_import
+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= gnbd_import.o \
../../utils/gnbd_utils.o \
@@ -34,13 +38,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/utils/Makefile 2007/12/21 20:13:53 1.4
+++ cluster/gnbd/utils/Makefile 2007/12/22 12:46:29 1.5
@@ -14,6 +14,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
SHAREDOBJS= member_cman.o \
trans.o \
@@ -24,8 +26,4 @@
all: ${SHAREDOBJS}
-install:
-
-uninstall:
-
clean: generalclean
--- cluster/gnbd-kernel/src/Makefile 2007/12/22 05:10:49 1.10
+++ cluster/gnbd-kernel/src/Makefile 2007/12/22 12:46:29 1.11
@@ -11,9 +11,17 @@
###############################################################################
###############################################################################
+TARGET= gnbd.ko
+
+KMODT=$(TARGET)
+KDIRT=drivers/block/gnbd
+KHEADT=gnbd.h
+
ifndef USING_KBUILD
include ../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
endif
PWD = $(shell pwd)
@@ -25,14 +33,4 @@
all:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes
-install: all
- install -d ${incdir}/linux
- install gnbd.h ${incdir}/linux
- install -d ${module_dir}/drivers/block/gnbd
- install gnbd.ko ${module_dir}/drivers/block/gnbd
-
-uninstall:
- ${UNINSTALL} gnbd.ko ${module_dir}/drivers/block/gnbd
- ${UNINSTALL} gnbd.h ${incdir}/linux
-
clean: generalclean
--- cluster/group/daemon/Makefile 2007/12/22 12:18:54 1.25
+++ cluster/group/daemon/Makefile 2007/12/22 12:46:29 1.26
@@ -12,9 +12,13 @@
TARGET= groupd
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= app.o \
cpg.o \
@@ -34,11 +38,3 @@
$(CC) -o $@ $^ $(LDFLAGS)
clean: generalclean
-
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
--- cluster/group/dlm_controld/Makefile 2007/12/21 20:13:53 1.15
+++ cluster/group/dlm_controld/Makefile 2007/12/22 12:46:29 1.16
@@ -12,9 +12,13 @@
TARGET= dlm_controld
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
member_cman.o \
@@ -39,13 +43,6 @@
depends:
$(MAKE) -C ../lib all
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/group/gfs_controld/Makefile 2007/12/21 20:13:53 1.17
+++ cluster/group/gfs_controld/Makefile 2007/12/22 12:46:29 1.18
@@ -12,9 +12,13 @@
TARGET= gfs_controld
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o \
member_cman.o \
@@ -41,13 +45,6 @@
depends:
$(MAKE) -C ../lib all
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET}
--- cluster/group/lib/Makefile 2007/12/21 20:13:54 1.11
+++ cluster/group/lib/Makefile 2007/12/22 12:46:29 1.12
@@ -15,6 +15,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
STATICLIB=$(TARGET).a
@@ -28,8 +30,4 @@
${AR} r $@ $^
${RANLIB} $@
-install: all
-
-uninstall:
-
clean: generalclean
--- cluster/group/tool/Makefile 2007/12/21 20:13:54 1.14
+++ cluster/group/tool/Makefile 2007/12/22 12:46:30 1.15
@@ -12,9 +12,13 @@
TARGET= group_tool
+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS= main.o
@@ -33,11 +37,4 @@
clean: generalclean
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
.PHONY: all ${TARGET}
/cvs/cluster/cluster/make/install.mk,v --> standard output
revision 1.1
--- cluster/make/install.mk
+++ - 2007-12-22 12:46:36.187963000 +0000
@@ -0,0 +1,45 @@
+install: all
+ifdef LIBDIRT
+ install -d ${libdir}
+ install -m644 ${LIBDIRT} ${libdir}
+endif
+ifdef LIBSYMT
+ cp -a ${LIBSYMT} ${libdir}
+endif
+ifdef INCDIRT
+ install -d ${incdir}
+ for i in ${INCDIRT}; do \
+ install -m644 $(S)/$$i ${incdir}; \
+ done
+endif
+ifdef SBINDIRT
+ install -d ${sbindir}
+ install -m755 ${SBINDIRT} ${sbindir}
+endif
+ifdef SBINSYMT
+ cp -a ${SBINSYMT} ${sbindir}
+endif
+ifdef LCRSOT
+ install -d ${libexecdir}/lcrso
+ install -m644 ${LCRSOT} ${libexecdir}/lcrso
+endif
+ifdef INITDT
+ install -d ${DESTDIR}/etc/init.d
+ for i in ${INITDT}; do \
+ install -m755 $(S)/$$i ${DESTDIR}/etc/init.d; \
+ done
+endif
+ifdef UDEVT
+ install -d ${DESTDIR}/etc/udev/rules.d
+ for i in ${UDEVT}; do \
+ install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d; \
+ done
+endif
+ifdef KMODT
+ install -d ${module_dir}/${KDIRT}
+ install -m644 ${KMODT} ${module_dir}/${KDIRT}
+endif
+ifdef KHEADT
+ install -d ${incdir}/linux
+ install -m644 ${KHEADT} ${incdir}/linux
+endif
/cvs/cluster/cluster/make/uninstall.mk,v --> standard output
revision 1.1
--- cluster/make/uninstall.mk
+++ - 2007-12-22 12:46:36.267099000 +0000
@@ -0,0 +1,31 @@
+uninstall:
+ifdef LIBDIRT
+ ${UNINSTALL} ${LIBDIRT} ${libdir}
+endif
+ifdef LIBSYMT
+ ${UNINSTALL} ${LIBSYMT} ${libdir}
+endif
+ifdef INCDIRT
+ ${UNINSTALL} ${INCDIRT} ${incdir}
+endif
+ifdef SBINDIRT
+ ${UNINSTALL} ${SBINDIRT} ${sbindir}
+endif
+ifdef SBINSYMT
+ ${UNINSTALL} ${SBINDIRT} ${sbindir}
+endif
+ifdef LCRSOT
+ ${UNINSTALL} ${LCRSOT} ${libexecdir}/lcrso
+endif
+ifdef INITDT
+ ${UNINSTALL} ${INITDT} ${DESTDIR}/etc/init.d
+endif
+ifdef UDEVT
+ ${UNINSTALL} ${UDEVT} {DESTDIR}/etc/udev/rules.d
+endif
+ifdef KMODT
+ ${UNINSTALL} ${KMODT} ${module_dir}/${KDIRT}
+endif
+ifdef KHEADT
+ ${UNINSTALL} ${KHEADT} ${incdir}/linux
+endif
--- cluster/make/fenceperl.mk 2007/12/21 20:13:54 1.3
+++ cluster/make/fenceperl.mk 2007/12/22 12:46:30 1.4
@@ -1,4 +1,8 @@
+SBINDIRT=$(TARGET)
+
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all: $(TARGET)
@@ -11,13 +15,4 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET).pl >> $(TARGET)
chmod +x $(TARGET)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/make/fencepy.mk 2007/12/21 20:13:54 1.3
+++ cluster/make/fencepy.mk 2007/12/22 12:46:30 1.4
@@ -1,4 +1,8 @@
+SBINDIRT=$(TARGET)
+
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all: $(TARGET)
@@ -11,13 +15,4 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET).py >> $(TARGET)
chmod +x $(TARGET)
-install: all
- if [ ! -d ${sbindir} ]; then \
- install -d ${sbindir}; \
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/rgmanager/init.d/Makefile 2007/12/21 20:13:55 1.5
+++ cluster/rgmanager/init.d/Makefile 2007/12/22 12:46:30 1.6
@@ -12,17 +12,14 @@
TARGET= rgmanager
+INITDT=$(TARGET)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
all:
clean:
check:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/rgmanager/src/clulib/Makefile 2007/12/21 20:13:55 1.22
+++ cluster/rgmanager/src/clulib/Makefile 2007/12/22 12:46:30 1.23
@@ -17,6 +17,8 @@
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS1= clulog.o daemon_init.o signals.o msgsimple.o \
gettid.o rg_strings.o message.o members.o fdops.o \
@@ -38,10 +40,6 @@
all: ${TARGET1} ${TARGET2} ${TARGET3}
-install: all
-
-uninstall:
-
${TARGET1}: ${OBJS1}
${AR} cru $@ $^
${RANLIB} $@
--- cluster/rgmanager/src/daemons/Makefile 2007/12/21 20:13:55 1.29
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/22 12:46:30 1.30
@@ -15,9 +15,13 @@
TARGET3= rg_test
TARGET4= dtest
+SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
OBJS1= depends.o \
fo_domain.o \
@@ -115,13 +119,6 @@
depends:
$(MAKE) -C ../clulib all
-install: all
- install -d ${sbindir}
- install -m755 ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-
clean: generalclean
rm -f tests/*.out*
--- cluster/rgmanager/src/resources/Makefile 2007/12/20 22:10:05 1.22
+++ cluster/rgmanager/src/resources/Makefile 2007/12/22 12:46:30 1.23
@@ -32,9 +32,6 @@
all:
install: all
- echo ${sharedir}
- echo ${sbindir}
- install -d ${sharedir}
install -d ${sharedir}/utils
for i in $(RESOURCES); do \
install $(S)/$$i ${sharedir}; \
--- cluster/rgmanager/src/utils/Makefile 2007/12/21 20:13:55 1.22
+++ cluster/rgmanager/src/utils/Makefile 2007/12/22 12:46:30 1.23
@@ -17,9 +17,13 @@
TARGET5= clulog
TARGET6= clunfslock
+SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
DISABLEDTARGETS= cluarp
@@ -56,13 +60,6 @@
depends:
$(MAKE) -C ../clulib all
-install: all
- install -d ${sbindir}
- install ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-
clean: generalclean
.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
@ 2007-12-22 13:37 fabbione
0 siblings, 0 replies; 7+ messages in thread
From: fabbione @ 2007-12-22 13:37 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-12-22 13:36:59
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/init.d : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
dlm/lib : Makefile
dlm/tests/usertest: Makefile
dlm/tool : Makefile
fence/agents : Makefile
fence/agents/ipmilan: Makefile
fence/agents/manual: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/scsi: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
gfs : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/init.d : Makefile
gfs/libgfs : Makefile
gfs/tests/filecon2: Makefile
gfs/tests/mmdd : Makefile
gfs-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/debug : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/init.d : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
gnbd/utils : Makefile
gnbd-kernel/src: Makefile
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/test : Makefile
group/tool : Makefile
make : fenceperl.mk fencepy.mk man.mk uninstall.mk
rgmanager/init.d: Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/resources: Makefile
rgmanager/src/utils: Makefile
Added files:
dlm/lib : 51-dlm.rules
Removed files:
dlm/scripts : 51-dlm.rules
Log message:
Fix a few regressions introduced by the big Makefile clean up:
- restore all: target as default. Libraries need a small special casing in the
include / target order due to var expansion.
- fix udev uninstall target: typo in make/uninstall.mk and requires (for sake
of simplicity 51-dlm.rules in /lib instead of /script.
- gfs/Makefile and fence/agents/Makefile don't need passthrough.mk.
- Fix uninstall of symlinks.
- Fix uninstall of rgmanager resources.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.60&r2=1.61
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/51-dlm.rules.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/scripts/51-dlm.rules.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/filecon2/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/mmdd/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/debug/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/test/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fenceperl.mk.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fencepy.mk.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/man.mk.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/uninstall.mk.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
--- cluster/ccs/ccs_test/Makefile 2007/12/22 12:46:24 1.13
+++ cluster/ccs/ccs_test/Makefile 2007/12/22 13:36:49 1.14
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -28,7 +30,6 @@
LDFLAGS += -L${ccslibdir} -lccs
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/ccs/ccs_tool/Makefile 2007/12/22 12:46:24 1.19
+++ cluster/ccs/ccs_tool/Makefile 2007/12/22 13:36:49 1.20
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -34,7 +36,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += `xml2-config --libs` -L${libdir} -ldl
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/ccs/daemon/Makefile 2007/12/22 12:46:24 1.21
+++ cluster/ccs/daemon/Makefile 2007/12/22 13:36:49 1.22
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -34,7 +36,6 @@
LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread -ldl
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/ccs/lib/Makefile 2007/12/22 12:46:24 1.13
+++ cluster/ccs/lib/Makefile 2007/12/22 13:36:49 1.14
@@ -15,6 +15,8 @@
LIBDIRT=$(TARGET)
INCDIRT=ccs.h
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -29,7 +31,6 @@
CFLAGS += -I$(S)/../include -I$(S)/../common
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
${AR} cr $@ $^
--- cluster/cman/cman_tool/Makefile 2007/12/22 12:46:24 1.29
+++ cluster/cman/cman_tool/Makefile 2007/12/22 13:36:49 1.30
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -29,7 +31,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/cman/daemon/Makefile 2007/12/22 12:46:24 1.60
+++ cluster/cman/daemon/Makefile 2007/12/22 13:36:50 1.61
@@ -14,6 +14,8 @@
LCRSOT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -35,7 +37,6 @@
barrier.o \
cmanccs.o
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
--- cluster/cman/init.d/Makefile 2007/12/22 12:46:25 1.7
+++ cluster/cman/init.d/Makefile 2007/12/22 13:36:50 1.8
@@ -14,10 +14,11 @@
INITDT=$(TARGETS)
+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all:
clean:
--- cluster/cman/lib/Makefile 2007/12/22 12:46:25 1.15
+++ cluster/cman/lib/Makefile 2007/12/22 13:36:50 1.16
@@ -22,20 +22,21 @@
INCDIRT=$(TARGET).h
include ../../make/defines.mk
+
+SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+STATICLIB=$(TARGET).a
+
+all: $(STATICLIB) $(SHAREDLIB)
+
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
-STATICLIB=$(TARGET).a
-
CFLAGS += -fPIC
CFLAGS += -I${cmanincdir} -I$(S)/../daemon
CFLAGS += -I${incdir}
-all: $(STATICLIB) $(SHAREDLIB)
-
$(TARGET).a: $(TARGET).o
${AR} r $@ $^
${RANLIB} $@
--- cluster/cman/qdisk/Makefile 2007/12/22 12:46:25 1.17
+++ cluster/cman/qdisk/Makefile 2007/12/22 13:36:50 1.18
@@ -15,6 +15,8 @@
SBINDIRT=${TARGET1} ${TARGET2}
+all: depends ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -44,7 +46,6 @@
disk_util.o \
proc.o
-all: depends ${TARGET1} ${TARGET2}
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
--- cluster/cman/tests/Makefile 2007/12/21 20:13:44 1.12
+++ cluster/cman/tests/Makefile 2007/12/22 13:36:50 1.13
@@ -12,6 +12,8 @@
TARGETS= client libtest sysman sysmand
+all: depends ${TARGETS}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -21,7 +23,6 @@
LDFLAGS += -L${cmanlibdir} -lcman
-all: depends ${TARGETS}
depends:
$(MAKE) -C ../lib all
--- cluster/dlm/lib/51-dlm.rules 2007/03/28 13:49:45 1.2
+++ cluster/dlm/lib/51-dlm.rules 2007/12/22 13:36:50 1.3
@@ -1,3 +1,4 @@
-KERNEL=="dlm-control", NAME="misc/dlm-control"
-KERNEL=="dlm_default", NAME="misc/dlm_default" MODE="0666"
-KERNEL=="dlm_*", NAME="misc/%k" MODE="0660"
+KERNEL=="dlm-control", NAME="misc/dlm-control", MODE="0666"
+KERNEL=="dlm_default", NAME="misc/dlm_default", MODE="0666"
+KERNEL=="dlm_*", NAME="misc/%k", MODE="0660"
+
--- cluster/dlm/lib/Makefile 2007/12/22 12:46:25 1.26
+++ cluster/dlm/lib/Makefile 2007/12/22 13:36:50 1.27
@@ -25,9 +25,15 @@
INCDIRT=$(TARGET).h
-UDEVT=../scripts/51-dlm.rules
+UDEVT=51-dlm.rules
include ../../make/defines.mk
+
+SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+STATICLIB=$(TARGET).a $(TARGET)_lt.a
+
+all: $(STATICLIB) $(SHAREDLIB)
+
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
@@ -35,16 +41,12 @@
AISTARGET= libaislock
-SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
-STATICLIB=$(TARGET).a $(TARGET)_lt.a
-
CFLAGS += -I$(S)
CFLAGS += -I${incdir}
CFLAGS += -I$(KERNEL_SRC)/include
LDFLAGS += -lpthread
-all: $(STATICLIB) $(SHAREDLIB)
$(TARGET).a: $(TARGET).o $(AISTARGET).o
${AR} r $@ $^
--- cluster/dlm/tests/usertest/Makefile 2007/12/21 20:13:45 1.16
+++ cluster/dlm/tests/usertest/Makefile 2007/12/22 13:36:51 1.17
@@ -13,11 +13,12 @@
TARGETS= dlmtest asttest lstest pingtest lvb \
dlmtest2 flood alternate-lvb joinleave threads
+all: depends ${TARGETS}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
-all: depends ${TARGETS}
CFLAGS += -D_REENTRANT
CFLAGS += -I${dlmincdir}
--- cluster/dlm/tool/Makefile 2007/12/22 12:46:25 1.8
+++ cluster/dlm/tool/Makefile 2007/12/22 13:36:51 1.9
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -28,7 +30,6 @@
LDFLAGS += -L${dlmlibdir} -ldlm
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/Makefile 2007/12/21 09:11:14 1.19
+++ cluster/fence/agents/Makefile 2007/12/22 13:36:51 1.20
@@ -12,7 +12,6 @@
###############################################################################
include ../../make/defines.mk
-include $(OBJDIR)/make/passthrough.mk
SUBDIRS = ${fence_agents}
--- cluster/fence/agents/ipmilan/Makefile 2007/12/22 12:46:25 1.12
+++ cluster/fence/agents/ipmilan/Makefile 2007/12/22 13:36:51 1.13
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -26,7 +28,6 @@
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/manual/Makefile 2007/12/22 12:46:25 1.14
+++ cluster/fence/agents/manual/Makefile 2007/12/22 13:36:51 1.15
@@ -15,12 +15,13 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all: ${TARGET}
# Using manual override instead of the binary version.
# (this version does not require any configuration params
--- cluster/fence/agents/rackswitch/Makefile 2007/12/22 12:46:26 1.10
+++ cluster/fence/agents/rackswitch/Makefile 2007/12/22 13:36:51 1.11
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -25,7 +27,6 @@
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/rps10/Makefile 2007/12/22 12:46:26 1.10
+++ cluster/fence/agents/rps10/Makefile 2007/12/22 13:36:52 1.11
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -27,7 +29,6 @@
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/scsi/Makefile 2007/12/22 12:46:26 1.17
+++ cluster/fence/agents/scsi/Makefile 2007/12/22 13:36:52 1.18
@@ -15,12 +15,13 @@
SBINDIRT=$(TARGET) $(TARGET)_test
INITDT= scsi_reserve
+all: $(TARGET) $(TARGET)_test
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all: $(TARGET) $(TARGET)_test
$(TARGET):
: > $(TARGET)
--- cluster/fence/agents/xvm/Makefile 2007/12/22 12:46:26 1.19
+++ cluster/fence/agents/xvm/Makefile 2007/12/22 13:36:52 1.20
@@ -16,6 +16,8 @@
SBINDIRT=$(TARGET1) $(TARGET2)
+all: ${TARGET1} ${TARGET2}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -55,7 +57,6 @@
EXTRA_LDFLAGS += -L${virtlibdir} -lvirt -L${openaislibdir} -lSaCkpt
XML_LDFLAGS += `xml2-config --libs`
-all: ${TARGET1} ${TARGET2}
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/fence_node/Makefile 2007/12/22 12:46:26 1.14
+++ cluster/fence/fence_node/Makefile 2007/12/22 13:36:52 1.15
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/fence_tool/Makefile 2007/12/22 12:46:26 1.21
+++ cluster/fence/fence_tool/Makefile 2007/12/22 13:36:52 1.22
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../../group/lib -lgroup
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/fenced/Makefile 2007/12/22 12:46:26 1.17
+++ cluster/fence/fenced/Makefile 2007/12/22 13:36:52 1.18
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -35,7 +37,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../../group/lib -l group
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/Makefile 2007/12/21 09:11:14 1.14
+++ cluster/gfs/Makefile 2007/12/22 13:36:52 1.15
@@ -12,7 +12,6 @@
###############################################################################
include ../make/defines.mk
-include $(OBJDIR)/make/passthrough.mk
SUBDIRS=libgfs gfs_debug gfs_edit gfs_fsck gfs_grow gfs_jadd gfs_mkfs gfs_quota gfs_tool man init.d
--- cluster/gfs/gfs_debug/Makefile 2007/12/22 12:46:26 1.14
+++ cluster/gfs/gfs_debug/Makefile 2007/12/22 13:36:52 1.15
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -33,7 +35,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_edit/Makefile 2007/12/22 12:46:26 1.14
+++ cluster/gfs/gfs_edit/Makefile 2007/12/22 13:36:53 1.15
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@
LDFLAGS += -L${ncurseslibdir} -lncurses
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_fsck/Makefile 2007/12/22 12:46:27 1.17
+++ cluster/gfs/gfs_fsck/Makefile 2007/12/22 13:36:53 1.18
@@ -16,6 +16,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2)
+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -58,7 +60,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}
-all: ${TARGET1} ${TARGET2}
${TARGET1}: $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_grow/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/gfs_grow/Makefile 2007/12/22 13:36:53 1.16
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@
LDFLAGS += -L../libgfs -lgfs
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_jadd/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/gfs_jadd/Makefile 2007/12/22 13:36:53 1.16
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@
LDFLAGS += -L../libgfs -lgfs
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_mkfs/Makefile 2007/12/22 12:46:27 1.16
+++ cluster/gfs/gfs_mkfs/Makefile 2007/12/22 13:36:53 1.17
@@ -17,6 +17,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2)
+all: depends ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -38,7 +40,6 @@
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs -lgfs
-all: depends ${TARGET1} ${TARGET2}
${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_quota/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/gfs_quota/Makefile 2007/12/22 13:36:53 1.16
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_tool/Makefile 2007/12/22 12:46:27 1.19
+++ cluster/gfs/gfs_tool/Makefile 2007/12/22 13:36:53 1.20
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -36,7 +38,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/init.d/Makefile 2007/12/22 12:46:27 1.7
+++ cluster/gfs/init.d/Makefile 2007/12/22 13:36:54 1.8
@@ -14,10 +14,11 @@
INITDT=$(TARGET)
+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all:
clean:
--- cluster/gfs/libgfs/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/libgfs/Makefile 2007/12/22 13:36:54 1.16
@@ -13,6 +13,8 @@
TARGET=libgfs.a
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -42,7 +44,6 @@
super.o \
util.o
-all: ${TARGET}
${TARGET}: ${OBJS}
${AR} cru $@ $^
--- cluster/gfs/tests/filecon2/Makefile 2007/12/21 20:13:51 1.5
+++ cluster/gfs/tests/filecon2/Makefile 2007/12/22 13:36:54 1.6
@@ -11,6 +11,8 @@
###############################################################################
###############################################################################
+all: $(TARGETS)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -21,7 +23,6 @@
CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS += -I../../include
-all: $(TARGETS)
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/tests/mmdd/Makefile 2007/12/21 20:13:51 1.3
+++ cluster/gfs/tests/mmdd/Makefile 2007/12/22 13:36:54 1.4
@@ -11,6 +11,8 @@
###############################################################################
###############################################################################
+all: $(TARGETS)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
@@ -18,7 +20,6 @@
CFLAGS += -D_GNU_SOURCE
-all: $(TARGETS)
mmdd.o: mmdd.c
$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $<
--- cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 12:46:27 1.21
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 13:36:54 1.22
@@ -17,6 +17,8 @@
KDIRT=fs/gfs
KHEADT=gfs_ondisk.h gfs_ioctl.h
+all: ${TARGET}
+
ifndef USING_KBUILD
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
@@ -68,7 +70,7 @@
unlinked.o \
util.o
-all:
+${TARGET}:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes
clean: generalclean
--- cluster/gfs2/convert/Makefile 2007/12/22 12:46:28 1.16
+++ cluster/gfs2/convert/Makefile 2007/12/22 13:36:54 1.17
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -29,7 +31,6 @@
LDFLAGS += -L../libgfs2 -lgfs2
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/debug/Makefile 2007/08/28 04:35:43 1.5
+++ cluster/gfs2/debug/Makefile 2007/12/22 13:36:54 1.6
@@ -12,6 +12,8 @@
###############################################################################
top_srcdir=..
+all: ${TARGET}
+
include ${top_srcdir}/make/defines.mk
TARGET= gfs2_debug
@@ -41,7 +43,6 @@
LDFLAGS+= -L${libdir}
-all: ${TARGET}
gfs2_debug: ${SOURCE}
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LDLIBS} -o $@
--- cluster/gfs2/edit/Makefile 2007/12/22 12:46:28 1.16
+++ cluster/gfs2/edit/Makefile 2007/12/22 13:36:54 1.17
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -34,7 +36,6 @@
LDFLAGS += -L${ncurseslibdir} -lncurses
LDFLAGS += -L../libgfs2/ -lgfs2
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/fsck/Makefile 2007/12/22 12:46:28 1.20
+++ cluster/gfs2/fsck/Makefile 2007/12/22 13:36:55 1.21
@@ -16,6 +16,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2)
+all: depends ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -49,7 +51,6 @@
LDFLAGS += -L../libgfs2 -lgfs2
-all: depends ${TARGET1} ${TARGET2}
${TARGET1}: $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/init.d/Makefile 2007/12/22 12:46:28 1.7
+++ cluster/gfs2/init.d/Makefile 2007/12/22 13:36:55 1.8
@@ -14,10 +14,11 @@
INITDT=$(TARGET)
+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all:
clean:
--- cluster/gfs2/libgfs2/Makefile 2007/12/22 12:46:28 1.17
+++ cluster/gfs2/libgfs2/Makefile 2007/12/22 13:36:55 1.18
@@ -13,6 +13,8 @@
TARGET= libgfs2.a
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -41,7 +43,6 @@
super.o \
rgrp.o
-all: ${TARGET}
${TARGET}: ${OBJS}
${AR} cru $@ $^
--- cluster/gfs2/mkfs/Makefile 2007/12/22 12:46:28 1.25
+++ cluster/gfs2/mkfs/Makefile 2007/12/22 13:36:55 1.26
@@ -11,6 +11,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2) $(TARGET3) $(TARGET4)
+all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -30,7 +32,6 @@
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs2 -lgfs2
-all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/mount/Makefile 2007/12/21 20:13:52 1.22
+++ cluster/gfs2/mount/Makefile 2007/12/22 13:36:55 1.23
@@ -13,6 +13,8 @@
TARGET1= mount.gfs2
TARGET2= umount.gfs2
+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}
-all: ${TARGET1} ${TARGET2}
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/quota/Makefile 2007/12/22 12:46:28 1.17
+++ cluster/gfs2/quota/Makefile 2007/12/22 13:36:56 1.18
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
LDFLAGS += -L../libgfs2 -lgfs2
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/tool/Makefile 2007/12/22 12:46:28 1.19
+++ cluster/gfs2/tool/Makefile 2007/12/22 13:36:56 1.20
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -37,7 +39,6 @@
LDFLAGS += -L../libgfs2 -lgfs2
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/client/Makefile 2007/12/22 12:46:28 1.19
+++ cluster/gnbd/client/Makefile 2007/12/22 13:36:56 1.20
@@ -16,6 +16,8 @@
SBINDIRT=$(TARGET1) $(TARGET2)
+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -37,7 +39,6 @@
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-all: ${TARGET1} ${TARGET2}
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/server/Makefile 2007/12/22 12:46:29 1.19
+++ cluster/gnbd/server/Makefile 2007/12/22 13:36:56 1.20
@@ -16,6 +16,8 @@
SBINDIRT=$(TARGET1) $(TARGET2)
+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -42,7 +44,6 @@
LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-all: ${TARGET1} ${TARGET2}
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/22 12:46:29 1.10
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/22 13:36:56 1.11
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -26,7 +28,6 @@
CFLAGS += -I$(S)/../../include -I$(S)/../gnbd_import
CFLAGS += -I${incdir}
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 12:46:29 1.20
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 13:36:56 1.21
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET) gnbd_get_uid
+all: ${TARGET} gnbd_get_uid
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-all: ${TARGET} gnbd_get_uid
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 12:46:29 1.17
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 13:36:57 1.18
@@ -15,6 +15,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -33,7 +35,6 @@
LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/utils/Makefile 2007/12/22 12:46:29 1.5
+++ cluster/gnbd/utils/Makefile 2007/12/22 13:36:57 1.6
@@ -11,6 +11,8 @@
###############################################################################
###############################################################################
+all: ${SHAREDOBJS}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -24,6 +26,5 @@
CFLAGS += -I${cmanincdir}
CFLAGS += -I$(S)/../include
-all: ${SHAREDOBJS}
clean: generalclean
--- cluster/gnbd-kernel/src/Makefile 2007/12/22 12:46:29 1.11
+++ cluster/gnbd-kernel/src/Makefile 2007/12/22 13:36:57 1.12
@@ -17,6 +17,8 @@
KDIRT=drivers/block/gnbd
KHEADT=gnbd.h
+all: ${TARGET}
+
ifndef USING_KBUILD
include ../../make/defines.mk
include $(OBJDIR)/make/clean.mk
@@ -30,7 +32,7 @@
obj-m := gnbd.o
-all:
+${TARGET}:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes
clean: generalclean
--- cluster/group/daemon/Makefile 2007/12/22 12:46:29 1.26
+++ cluster/group/daemon/Makefile 2007/12/22 13:36:57 1.27
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg
-all: ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/dlm_controld/Makefile 2007/12/22 12:46:29 1.16
+++ cluster/group/dlm_controld/Makefile 2007/12/22 13:36:57 1.17
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -35,7 +37,6 @@
LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
LDFLAGS += -L../lib -lgroup
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/gfs_controld/Makefile 2007/12/22 12:46:29 1.18
+++ cluster/group/gfs_controld/Makefile 2007/12/22 13:36:57 1.19
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -37,7 +39,6 @@
LDFLAGS += -L${libdir}
LDFLAGS += -L../lib -lgroup
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/lib/Makefile 2007/12/22 12:46:29 1.12
+++ cluster/group/lib/Makefile 2007/12/22 13:36:58 1.13
@@ -12,19 +12,18 @@
TARGET=libgroup
+all: $(TARGET).a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-STATICLIB=$(TARGET).a
-
CFLAGS += -fPIC
CFLAGS += -I$(S) -I$(S)/../daemon
CFLAGS += -I${incdir}
-all: $(STATICLIB)
$(TARGET).a: $(TARGET).o
${AR} r $@ $^
--- cluster/group/test/Makefile 2007/12/21 20:13:54 1.6
+++ cluster/group/test/Makefile 2007/12/22 13:36:58 1.7
@@ -12,11 +12,12 @@
TARGETS= client clientd
+all: $(TARGETS)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
-all: $(TARGETS)
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/tool/Makefile 2007/12/22 12:46:30 1.15
+++ cluster/group/tool/Makefile 2007/12/22 13:36:58 1.16
@@ -14,6 +14,8 @@
SBINDIRT=$(TARGET)
+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -27,7 +29,6 @@
LDFLAGS += -L../lib -lgroup
-all: depends ${TARGET}
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/make/fenceperl.mk 2007/12/22 12:46:30 1.4
+++ cluster/make/fenceperl.mk 2007/12/22 13:36:58 1.5
@@ -1,11 +1,11 @@
SBINDIRT=$(TARGET)
+all: $(TARGET)
+
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all: $(TARGET)
-
$(TARGET):
: > $(TARGET)
awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(S)/$(TARGET).pl >> $(TARGET)
--- cluster/make/fencepy.mk 2007/12/22 12:46:30 1.4
+++ cluster/make/fencepy.mk 2007/12/22 13:36:58 1.5
@@ -1,11 +1,11 @@
SBINDIRT=$(TARGET)
+all: $(TARGET)
+
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all: $(TARGET)
-
$(TARGET):
: > $(TARGET)
awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(S)/$(TARGET).py >> $(TARGET)
--- cluster/make/man.mk 2007/12/21 18:37:16 1.1
+++ cluster/make/man.mk 2007/12/22 13:36:58 1.2
@@ -1,3 +1,5 @@
+all:
+
install:
for i in ${TARGET}; do \
p=`echo $$i | sed -e 's#.*\.##g'`; \
@@ -11,6 +13,4 @@
${UNINSTALL} $$i ${mandir}/man$$p; \
done
-all:
-
clean:
--- cluster/make/uninstall.mk 2007/12/22 12:46:30 1.1
+++ cluster/make/uninstall.mk 2007/12/22 13:36:58 1.2
@@ -12,7 +12,7 @@
${UNINSTALL} ${SBINDIRT} ${sbindir}
endif
ifdef SBINSYMT
- ${UNINSTALL} ${SBINDIRT} ${sbindir}
+ ${UNINSTALL} ${SBINSYMT} ${sbindir}
endif
ifdef LCRSOT
${UNINSTALL} ${LCRSOT} ${libexecdir}/lcrso
@@ -21,7 +21,7 @@
${UNINSTALL} ${INITDT} ${DESTDIR}/etc/init.d
endif
ifdef UDEVT
- ${UNINSTALL} ${UDEVT} {DESTDIR}/etc/udev/rules.d
+ ${UNINSTALL} ${UDEVT} ${DESTDIR}/etc/udev/rules.d
endif
ifdef KMODT
${UNINSTALL} ${KMODT} ${module_dir}/${KDIRT}
--- cluster/rgmanager/init.d/Makefile 2007/12/22 12:46:30 1.6
+++ cluster/rgmanager/init.d/Makefile 2007/12/22 13:36:58 1.7
@@ -14,11 +14,12 @@
INITDT=$(TARGET)
+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
-all:
clean:
--- cluster/rgmanager/src/clulib/Makefile 2007/12/22 12:46:30 1.23
+++ cluster/rgmanager/src/clulib/Makefile 2007/12/22 13:36:58 1.24
@@ -14,6 +14,8 @@
TARGET2= liblalloc.a
TARGET3= msgtest
+all: ${TARGET1} ${TARGET2} ${TARGET3}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -38,7 +40,6 @@
LDFLAGS += -L. -lclulib -llalloc
LDFLAGS += -lpthread
-all: ${TARGET1} ${TARGET2} ${TARGET3}
${TARGET1}: ${OBJS1}
${AR} cru $@ $^
--- cluster/rgmanager/src/daemons/Makefile 2007/12/22 12:46:30 1.30
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/22 13:36:59 1.31
@@ -17,6 +17,8 @@
SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3)
+all: depends ${TARGET1} ${TARGET2} ${TARGET3}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -79,7 +81,6 @@
LOCAL_LDFLAGS += -llalloc
READLINE_LDFLAGS += -L${readlinelibdir} -lreadline
-all: depends ${TARGET1} ${TARGET2} ${TARGET3}
${TARGET1}: ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
--- cluster/rgmanager/src/resources/Makefile 2007/12/22 12:46:30 1.23
+++ cluster/rgmanager/src/resources/Makefile 2007/12/22 13:36:59 1.24
@@ -10,6 +10,8 @@
###############################################################################
###############################################################################
+all:
+
include ../../../make/defines.mk
RESOURCES=fs.sh service.sh ip.sh nfsclient.sh nfsexport.sh \
@@ -29,7 +31,6 @@
utils/httpd-parse-config.pl utils/tomcat-parse-config.pl \
utils/member_util.sh
-all:
install: all
install -d ${sharedir}/utils
@@ -44,7 +45,7 @@
done
uninstall:
- ${UNINSTALL} ${TARGETS} ${METADATA} ${UTIL_TARGETS} ${sharedir}
+ ${UNINSTALL} ${RESOURCES} ${TARGETS} ${METADATA} ${UTIL_TARGETS} ${sharedir}
clean:
--- cluster/rgmanager/src/utils/Makefile 2007/12/22 12:46:30 1.23
+++ cluster/rgmanager/src/utils/Makefile 2007/12/22 13:36:59 1.24
@@ -19,6 +19,8 @@
SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6)
+all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -36,7 +38,6 @@
LDFLAGS += -lcman -lpthread -ldl -lncurses -lccs
LDFLAGS += -L../clulib -lclulib
-all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
${TARGET1}: ${TARGET1:=.o}
$(CC) -o $@ $^ $(LDFLAGS)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-12-22 13:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-01 9:45 [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak fabbione
-- strict thread matches above, loose matches on Subject: below --
2007-12-22 13:37 fabbione
2007-12-22 12:46 fabbione
2007-12-21 20:14 fabbione
2007-12-21 9:15 fabbione
2007-05-15 14:37 fabbione
2007-05-03 16:56 fabbione
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).