From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 21 Dec 2007 09:15:30 -0000 Subject: [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ... Message-ID: <20071221091530.25753.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-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