Many files:

[tools/e2fsprogs.git] / resize / Makefile.in

diff --git a/resize/Makefile.in b/resize/Makefile.in
index deabd91..d25d783 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@
 
@@ -15,29 +16,33 @@ PROGS=              resize2fs
 TEST_PROGS=    test_extent
 MANPAGES=      resize2fs.8
 
-RESIZE_OBJS= extent.o ext2_block_move.o ext2_inode_move.o resize2fs.o \
-       main.o sim_progress.o 
+RESIZE_OBJS= extent.o resize2fs.o main.o sim_progress.o 
 
 TEST_EXTENT_OBJS= extent.o test_extent.o
 
 SRCS= $(srcdir)/extent.c \
-       $(srcdir)/ext2_block_move.c \
-       $(srcdir)/ext2_inode_move.c \
        $(srcdir)/resize2fs.c \
        $(srcdir)/main.c \
        $(srcdir)/sim_progress.c
 
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  $(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  $(LIBUUID)
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
+
+STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 
 .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
 
@@ -45,13 +50,13 @@ test_extent: $(TEST_EXTENT_OBJS)
        $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
        
 installdirs:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(usbindir) \
-               $(DESTDIR)$(man8dir) $(DESTDIR)$(cat8dir)
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) \
+               $(DESTDIR)$(man8dir)
 
 install: $(PROGS) $(MANPAGES) installdirs
        for i in $(PROGS); do \
-               $(INSTALL_PROGRAM) $$i $(DESTDIR)$(usbindir)/$$i; \
-               $(STRIP) $(DESTDIR)$(usbindir)/$$i; \
+               $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
+               $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
        done
        for i in $(MANPAGES); do \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
@@ -59,10 +64,10 @@ install: $(PROGS) $(MANPAGES) installdirs
 
 uninstall:
        for i in $(PROGS); do \
-               $(RM) -f $(usbindir)/$$i; \
+               $(RM) -f $(DESTDIR)$(sbindir)/$$i; \
        done
        for i in $(MANPAGES); do \
-               $(RM) -f $(man8dir)/$$i; \
+               $(RM) -f $(DESTDIR)$(man8dir)/$$i; \
        done
 
 test_extent.out: test_extent $(srcdir)/test_extent.in
@@ -100,15 +105,18 @@ $(top_srcdir)/.exclude-file:
                | sed -e "s/e2fsprogs/$$a/" > $(top_srcdir)/.exclude-file
        echo "$(SRCROOT)/build" >> $(top_srcdir)/.exclude-file
        echo "$(SRCROOT)/rpm.log" >> $(top_srcdir)/.exclude-file
+       echo "$(SRCROOT)/powerquest" >> $(top_srcdir)/.exclude-file
        echo "$(SRCROOT)/.exclude-file" >> $(top_srcdir)/.exclude-file
        echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
                >> $(top_srcdir)/.exclude-file
+       echo $(SRCROOT)/e2fsprogs-ALL-@E2FSPROGS_VERSION@.tar.gz \
+               >> $(top_srcdir)/.exclude-file
        
 source_tar_file: $(top_srcdir)/.exclude-file
        (cd $(top_srcdir)/..; a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
                $(TAR) -c -h -v -f - \
                        -X $$a/.exclude-file $$a | \
-               gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz)
+               gzip -9 > e2fsprogs-ALL-@E2FSPROGS_VERSION@.tar.gz)
        rm -f $(top_srcdir)/.exclude-file
 
 # +++ Dependency line eater +++
@@ -120,14 +128,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 \
@@ -135,7 +135,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 \