From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 22 Dec 2007 13:37:10 -0000 Subject: [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ... Message-ID: <20071222133710.4578.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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)