[Ocfs2-tools-commits] jlbec commits r273 - in branches/dlm-changes: debugfs.ocfs2 mkfs.ocfs2 mounted.ocfs2 ocfs2cdsl

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-09-28 19:51:11 -0500 (Tue, 28 Sep 2004)
New Revision: 273

Modified:
   branches/dlm-changes/debugfs.ocfs2/Makefile
   branches/dlm-changes/mkfs.ocfs2/Makefile
   branches/dlm-changes/mkfs.ocfs2/mkfs.c
   branches/dlm-changes/mounted.ocfs2/Makefile
   branches/dlm-changes/ocfs2cdsl/Makefile
   branches/dlm-changes/ocfs2cdsl/ocfs2cdsl.c
Log:

o Remove VERSION_FILES stuff.



Modified: branches/dlm-changes/debugfs.ocfs2/Makefile
===================================================================
--- branches/dlm-changes/debugfs.ocfs2/Makefile	2004-09-28 23:39:10 UTC (rev 272)
+++ branches/dlm-changes/debugfs.ocfs2/Makefile	2004-09-29 00:51:11 UTC (rev 273)
@@ -12,14 +12,18 @@
 CFLAGS += -Wall -O2
 
 CFILES = main.c commands.c dump.c readfs.c utils.c journal.c bindraw.c
-HFILES = include/main.h include/commands.h include/dump.h include/readfs.h include/utils.h include/jbd.h include/journal.h include/bindraw.h
+HFILES =			\
+	include/main.h		\
+	include/commands.h	\
+	include/dump.h		\
+	include/readfs.h	\
+	include/utils.h		\
+	include/jbd.h		\
+	include/journal.h	\
+	include/bindraw.h
 
 OBJS = $(subst .c,.o,$(CFILES))
 
-VERSION_FILES = $(CFILES) $(HFILES)
-VERSION_SRC = $(CFILES)
-VERSION_PREFIX = OCFS2
-
 MANS = debugfs.ocfs2.8
 
 DIST_FILES = $(CFILES) $(HFILES) README debugfs.ocfs2.8.in

Modified: branches/dlm-changes/mkfs.ocfs2/Makefile
===================================================================
--- branches/dlm-changes/mkfs.ocfs2/Makefile	2004-09-28 23:39:10 UTC (rev 272)
+++ branches/dlm-changes/mkfs.ocfs2/Makefile	2004-09-29 00:51:11 UTC (rev 273)
@@ -17,7 +17,8 @@
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
 
 INCLUDES = $(LIBOCFS2_CFLAGS)
-DEFINES = -DLINUX -DUSERSPACE_TOOL -DFORMAT_OCFS -DOCFS2_FLAT_INCLUDES
+DEFINES = -DLINUX -DUSERSPACE_TOOL -DFORMAT_OCFS -DOCFS2_FLAT_INCLUDES \
+	-DVERSION=\"$(VERSION)\"
 
 OPTIMIZE = -O2
 
@@ -35,15 +36,14 @@
 
 CFLAGS += $(OPTIMIZE)
 
-VERSION_FILES = mkfs.c
-VERSION_SRC = mkfs.c
-VERSION_PREFIX = OCFS2
+CFILES = mkfs.c
+OBJS = $(subst .c,.o,$(CFILES))
 
 MANS = mkfs.ocfs2.8
 
-DIST_FILES = $(VERSION_FILES) $(VERSION_SRC) mkfs.ocfs2.8.in
+DIST_FILES = $(CFILES) mkfs.ocfs2.8.in
 
-mkfs.ocfs2: mkfs.o
+mkfs.ocfs2: $(OBJS)
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
 
 readdir: readdir.o

Modified: branches/dlm-changes/mkfs.ocfs2/mkfs.c
===================================================================
--- branches/dlm-changes/mkfs.ocfs2/mkfs.c	2004-09-28 23:39:10 UTC (rev 272)
+++ branches/dlm-changes/mkfs.ocfs2/mkfs.c	2004-09-29 00:51:11 UTC (rev 273)
@@ -726,8 +726,7 @@
 static void
 version(const char *progname)
 {
-	fprintf(stderr, "%s %s %s (build %s)\n", progname,
-		OCFS2_BUILD_VERSION, OCFS2_BUILD_DATE, OCFS2_BUILD_MD5);
+	fprintf(stderr, "%s %s\n", progname, VERSION);
 }
 
 static void

Modified: branches/dlm-changes/mounted.ocfs2/Makefile
===================================================================
--- branches/dlm-changes/mounted.ocfs2/Makefile	2004-09-28 23:39:10 UTC (rev 272)
+++ branches/dlm-changes/mounted.ocfs2/Makefile	2004-09-29 00:51:11 UTC (rev 273)
@@ -30,15 +30,14 @@
 
 CFLAGS += $(OPTIMIZE)
 
-VERSION_FILES = mounted.c
-VERSION_SRC = mounted.c
-VERSION_PREFIX = OCFS2
+CFILES = mounted.c
+OBJS = $(subst .c,.o,$(CFILES))
 
 #MANS = fsck.ocfs2.8
 
-DIST_FILES = $(VERSION_FILES) $(VERSION_SRC)
+DIST_FILES = $(CFILES)
 
-mounted.ocfs2: mounted.o
+mounted.ocfs2: $(OBJS)
 	$(LINK) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) $(VERMAGIC)
 
 include $(TOPDIR)/Postamble.make

Modified: branches/dlm-changes/ocfs2cdsl/Makefile
===================================================================
--- branches/dlm-changes/ocfs2cdsl/Makefile	2004-09-28 23:39:10 UTC (rev 272)
+++ branches/dlm-changes/ocfs2cdsl/Makefile	2004-09-29 00:51:11 UTC (rev 273)
@@ -12,24 +12,23 @@
 
 SBIN_PROGRAMS = ocfs2cdsl
 
-DEFINES = -DG_DISABLE_DEPRECATED
+DEFINES = -DG_DISABLE_DEPRECATED -DVERSION=\"$(VERSION)\"
 INCLUDES = $(GLIB_CFLAGS)
 
 OPTIMIZE = -g -O0
 
 CFLAGS += $(OPTIMIZE)
 
-VERSION_FILES = ocfs2cdsl.c
-VERSION_SRC = ocfs2cdsl.c
-VERSION_PREFIX = OCFS2
+CFILES = ocfs2cdsl.c
+OBJS = $(subst .c,.o,$(CFILES))
 
 DIST_RULES = dist-incdir
 
 #MANS = ocfs2cdsl.8
 
-DIST_FILES = $(VERSION_FILES) $(VERSION_SRC) ocfs2cdsl.c #ocfs2cdsl.8.in
+DIST_FILES = $(CFILES) #ocfs2cdsl.8.in
 
-ocfs2cdsl: ocfs2cdsl.o
+ocfs2cdsl: $(OBJS)
 	$(LINK) $(GLIB_LIBS)
 
 include $(TOPDIR)/Postamble.make

Modified: branches/dlm-changes/ocfs2cdsl/ocfs2cdsl.c
===================================================================
--- branches/dlm-changes/ocfs2cdsl/ocfs2cdsl.c	2004-09-28 23:39:10 UTC (rev 272)
+++ branches/dlm-changes/ocfs2cdsl/ocfs2cdsl.c	2004-09-29 00:51:11 UTC (rev 273)
@@ -310,6 +310,11 @@
 	if ((optind == argc) && !show_version)
 		usage(progname);
 
+	if (show_version) {
+		version(progname);
+		exit(0);
+	}
+
 	filename = argv[optind++];
 
 	tmp = g_path_get_dirname(filename);
@@ -326,11 +331,6 @@
 	if (optind < argc)
 		usage(progname);
 
-	if (show_version) {
-		version(progname);
-		exit(0);
-	}
-
 	s = g_new0(State, 1);
 
 	s->progname = progname;
@@ -365,8 +365,7 @@
 static void
 version(const char *progname)
 {
-	fprintf(stderr, "%s %s %s (build %s)\n", progname,
-		OCFS2_BUILD_VERSION, OCFS2_BUILD_DATE, OCFS2_BUILD_MD5);
+	fprintf(stderr, "%s %s\n", progname, VERSION);
 }
 
 static char *