ChangeLog, Makefile.in, main.c:

  Makefile.in: Add rule to build a static version of resize2fs.  Update
  	dependency rules.
  main.c: #include ../version.h, instead of using a hard-coded version
  	string.

diff --git a/resize/ChangeLog b/resize/ChangeLog
index a9b9803..232bf70 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 27 01:02:50 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Add rule to build a static version of resize2fs.
+               Update dependency rules.
+
+       * main.c: #include ../version.h, instead of using a hard-coded
+               version string.
+
 Tue Feb 24 15:22:52 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Change the progress function to return an errcode_t; this allows

diff --git a/resize/Makefile.in b/resize/Makefile.in
index 7a74866..bab4f08 100644 (file)
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -8,6 +8,7 @@ VPATH = @srcdir@
 top_builddir = ..
 my_dir = resize
 INSTALL = @INSTALL@
+LDFLAG_STATIC = @LDFLAG_STATIC@
 
 @MCONFIG@
 
@@ -27,14 +28,21 @@ SRCS= $(srcdir)/extent.c \
 LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  $(LIBUUID)
 DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  $(LIBUUID)
 
+STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBUUID)
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBUUID)
+
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $< -o $@
 
-all:: $(PROGS) $(TEST_PROGS) $(MANPAGES)
+all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) resize2fs.static
 
 resize2fs: $(RESIZE_OBJS) $(DEPLIBS)
        $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
 
+resize2fs.static: $(RESIZE_OBJS)  $(STATIC_DEPLIBS)
+       $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
+               $(RESIZE_OBJS) $(STATIC_LIBS) 
+
 resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in
        $(SUBSTITUTE) $(srcdir)/resize2fs.8.in resize2fs.8
 
@@ -117,14 +125,6 @@ extent.o: $(srcdir)/extent.c $(srcdir)/resize2fs.h \
  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
  $(top_srcdir)/lib/ext2fs/bitops.h
-ext2_block_move.o: $(srcdir)/ext2_block_move.c $(srcdir)/resize2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h
-ext2_inode_move.o: $(srcdir)/ext2_inode_move.c $(srcdir)/resize2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h
 resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.h \
  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
@@ -132,7 +132,7 @@ resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.h \
 main.o: $(srcdir)/main.c $(srcdir)/resize2fs.h \
  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/../version.h
 sim_progress.o: $(srcdir)/sim_progress.c $(srcdir)/resize2fs.h \
  $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \

diff --git a/resize/main.c b/resize/main.c
index b251886..4f85995 100644 (file)
--- a/resize/main.c
+++ b/resize/main.c
@@ -17,8 +17,7 @@
 
 #include "resize2fs.h"
 
-#define E2FSPROGS_VERSION "1.10"
-#define E2FSPROGS_DATE "27-Apr-97"
+#include "../version.h"
 
 char *program_name, *device_name;