[Ocfs-tools-commits] manish commits r188 - trunk/ocfs2/mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-07-26 15:03:01 -0500 (Mon, 26 Jul 2004)
New Revision: 188

Modified:
   trunk/ocfs2/mkfs.ocfs2/Makefile
   trunk/ocfs2/mkfs.ocfs2/mkfs.c
   trunk/ocfs2/mkfs.ocfs2/mkfs2.c
Log:
Make new mkfs the default


Modified: trunk/ocfs2/mkfs.ocfs2/Makefile
===================================================================
--- trunk/ocfs2/mkfs.ocfs2/Makefile	2004-07-23 00:46:53 UTC (rev 187)
+++ trunk/ocfs2/mkfs.ocfs2/Makefile	2004-07-26 20:03:01 UTC (rev 188)
@@ -11,7 +11,7 @@
 
 CFLAGS = $(OPTS) -fno-strict-aliasing $(WARNINGS) 
 
-SBIN_PROGRAMS = mkfs.ocfs2 mkfs.ocfs2.test
+SBIN_PROGRAMS = mkfs.ocfs2 mkfs.ocfs2.kurt
 
 LIBOCFS2_CFLAGS = -I$(TOPDIR)/ocfs2/libocfs2/include
 LIBOCFS2_LIBS = -L$(TOPDIR)/ocfs2/libocfs2 -locfs2
@@ -35,8 +35,8 @@
 
 CFLAGS += $(OPTIMIZE)
 
-VERSION_FILES = mkfs2.c
-VERSION_SRC = mkfs2.c
+VERSION_FILES = mkfs.c
+VERSION_SRC = mkfs.c
 VERSION_PREFIX = OCFS2
 
 DIST_RULES = dist-incdir
@@ -64,10 +64,10 @@
 
 DIST_FILES = $(VERSION_FILES) $(VERSION_SRC) #mkfs.ocfs2.8.in
 
-mkfs.ocfs2: mkfs2.o
+mkfs.ocfs2: mkfs.o
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
-mkfs.ocfs2.test: mkfs.o
+mkfs.ocfs2.kurt: mkfs2.o
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
 readdir: readdir.o

Modified: trunk/ocfs2/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/ocfs2/mkfs.ocfs2/mkfs.c	2004-07-23 00:46:53 UTC (rev 187)
+++ trunk/ocfs2/mkfs.ocfs2/mkfs.c	2004-07-26 20:03:01 UTC (rev 188)
@@ -697,10 +697,6 @@
 	exit(0);
 }
 
-#define OCFS2_BUILD_VERSION "x"
-#define OCFS2_BUILD_DATE "y"
-#define OCFS2_BUILD_MD5 "z"
-
 static void
 version(const char *progname)
 {

Modified: trunk/ocfs2/mkfs.ocfs2/mkfs2.c
===================================================================
--- trunk/ocfs2/mkfs.ocfs2/mkfs2.c	2004-07-23 00:46:53 UTC (rev 187)
+++ trunk/ocfs2/mkfs.ocfs2/mkfs2.c	2004-07-26 20:03:01 UTC (rev 188)
@@ -1214,6 +1214,10 @@
 }
 
 
+#define OCFS2_BUILD_VERSION "x"
+#define OCFS2_BUILD_DATE "y"
+#define OCFS2_BUILD_MD5 "z"
+
 void version(char *progname)
 {
 	printf("%s %s %s (build %s)\n", progname,