[Cluster-devel] cluster/gfs2 Makefile bin/Makefile mount/Makefile

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-07-24 17:48:51

Modified files:
	gfs2           : Makefile 
	gfs2/bin       : Makefile 
	gfs2/mount     : Makefile 

Log message:
	have gfs2/Makefile install/uninstall mount and umount binaries itself
	rather than going through copytobin and having bin/Makefile install them
	(plan to remove copytobin from other dirs too)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/bin/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- cluster/gfs2/Makefile	2006/06/12 23:04:47	1.7
+++ cluster/gfs2/Makefile	2006/07/24 17:48:50	1.8
@@ -35,7 +35,6 @@
 	${MAKE} -C edit copytobin
 	${MAKE} -C fsck copytobin
 	${MAKE} -C mkfs copytobin
-	${MAKE} -C mount copytobin
 	${MAKE} -C quota copytobin
 	${MAKE} -C tool copytobin
 
@@ -54,11 +53,13 @@
 	rm -f make/defines.mk
 
 install:
+	${MAKE} -C mount install
 	${MAKE} -C bin install
 	${MAKE} -C man install
 	${MAKE} -C init.d install
 
 deinstall uninstall:
+	${MAKE} -C mount uninstall
 	${MAKE} -C bin uninstall
 	${MAKE} -C man uninstall
 	${MAKE} -C init.d uninstall
--- cluster/gfs2/bin/Makefile	2006/06/12 22:36:34	1.7
+++ cluster/gfs2/bin/Makefile	2006/07/24 17:48:50	1.8
@@ -16,10 +16,8 @@
 
 SBINPROGS= \
 	mkfs.gfs2 \
-	mount.gfs2 \
 	gfs2_edit \
 	gfs2_convert \
-	umount.gfs2 \
 	gfs2_fsck \
 #	gfs2_quota \
 
@@ -45,6 +43,6 @@
 
 uninstall:
 	#uninstall the hardlinked program as well
-	${UNINSTALL} ${SBINPROGS} gfs2_convert mkfs.gfs2 gfs2_fsck gfs2_grow gfs2_jadd gfs2_shrink mount.gfs2 umount.gfs2 ${sbindir}
+	${UNINSTALL} ${SBINPROGS} gfs2_convert mkfs.gfs2 gfs2_fsck gfs2_grow gfs2_jadd gfs2_shrink ${sbindir}
 
 
--- cluster/gfs2/mount/Makefile	2006/06/09 15:23:38	1.8
+++ cluster/gfs2/mount/Makefile	2006/07/24 17:48:50	1.9
@@ -12,6 +12,7 @@
 
 top_srcdir=..
 include ${top_srcdir}/make/defines.mk
+UNINSTALL=${top_srcdir}/scripts/uninstall.pl
 
 TARGET1= mount.gfs2
 TARGET2= umount.gfs2
@@ -62,15 +63,14 @@
 umount.gfs2: umount.gfs2.o ondisk1.o ondisk2.o util.o mtab.o
 	${CC} ${LDFLAGS} -o $@ $^
 
-install: ${TARGET1} ${TARGET2}
-	install ${TARGET1} ${sbindir}
-	install ${TARGET2} ${sbindir}
+install: mount.gfs2 umount.gfs2
+	install mount.gfs2 ${sbindir}
+	install umount.gfs2 ${sbindir}
 	(cd ${sbindir}; ln -f mount.gfs2 mount.gfs)
 	(cd ${sbindir}; ln -f umount.gfs2 umount.gfs)
 
-copytobin: ${TARGET1} ${TARGET2}
-	cp ${TARGET1} ${top_srcdir}/bin
-	cp ${TARGET2} ${top_srcdir}/bin
+uninstall:
+	${UNINSTALL} mount.gfs2 umount.gfs2 mount.gfs umount.gfs ${sbindir}
 
 clean:
 	rm -f *.o ${TARGET1} ${TARGET2}