Skip to contentSkip to conversation

Makefile.in: allow make install e4defrag

PATCH In review Peng Tao 2 participants 5 messages Jul 19, 2009 – Jul 20, 2009 Kbuild

lore
Share & tools
lore

Peng Tao

author
#0 lore raw

PATCH 5/5 Makefile.in: allow make install e4defrag

Current Makefile does not install e4defrag nor e4defrag.8. Change misc/Makefile.in to make the e4defrag available for use.

---
 misc/Makefile.in |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
misc/Makefile.in +4 -3
index 5f5dab5..4cfeb69 100644
@@ -28,10 +28,11 @@ SPROGS=		mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
 USPROGS=	mklost+found filefrag $(UUIDD_PROG)
 SMANPAGES=	tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
 			e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
-			logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+			logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@ \
+			e4defrag.8
 FMANPAGES=	mke2fs.conf.5
 
-UPROGS=		chattr lsattr @UUID_CMT@ uuidgen
+UPROGS=		chattr lsattr @UUID_CMT@ uuidgen e4defrag
 UMANPAGES=	chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
 
 LPROGS=		@E2INITRD_PROG@
@@ -99,7 +100,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 @PROFILE_CMT@	$(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
-	$(FMANPAGES) $(LPROGS) e4defrag
+	$(FMANPAGES) $(LPROGS)
 
 @PROFILE_CMT@all:: tune2fs.profiled blkid.profiled e2image.profiled \
 	e2undo.profiled mke2fs.profiled dumpe2fs.profiled fsck.profiled \
Signature · 1 line
1.6.2.GIT
author
#1 lore raw

Sorry, please ignore the patch series number. It was miss-typed.

Quoted 39 lines · Peng Tao

Current Makefile does not install e4defrag nor e4defrag.8. Change misc/Makefile.in to make the e4defrag available for use.

---
 misc/Makefile.in |    7 ++++---

 1 files changed, 4 insertions(+), 3 deletions(-)
misc/Makefile.in +2 -1
index 5f5dab5..4cfeb69 100644
@@ -28,10 +28,11 @@ SPROGS=             mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
  USPROGS=       mklost+found filefrag $(UUIDD_PROG)
  SMANPAGES=     tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
                        e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
-                       logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+                       logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@ \
+                       e4defrag.8

 FMANPAGES=     mke2fs.conf.5

misc/Makefile.in +1 -1
-UPROGS=                chattr lsattr @UUID_CMT@ uuidgen
+UPROGS=                chattr lsattr @UUID_CMT@ uuidgen e4defrag

 UMANPAGES=     chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1

 LPROGS=                @E2INITRD_PROG@

misc/Makefile.in +0 -0
@@ -99,7 +100,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree

 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<

 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
-       $(FMANPAGES) $(LPROGS) e4defrag
+       $(FMANPAGES) $(LPROGS)

 @PROFILE_CMT@all:: tune2fs.profiled blkid.profiled e2image.profiled \
       e2undo.profiled mke2fs.profiled dumpe2fs.profiled fsck.profiled \
--
1.6.2.GIT

Signature · 8 lines
Cheers,
Peng Tao
State Key Laboratory of Networking and Switching Technology
Beijing Univ. of Posts and Telecoms.
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
In reply to Peng Tao
Quoted 4 lines · Peng Tao

Current Makefile does not install e4defrag nor e4defrag.8. Change misc/Makefile.in to make the e4defrag available for use.

Since this is all still fairly developmental at this point (I think?) perhaps a special "make install-e4defrag" target might be best.

Otherwise packages which "make install" will start shipping e4defrag, and I'm not sure we want to do that quite yet.

-Eric

Quoted 31 lines
---
 misc/Makefile.in |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
misc/Makefile.in +4 -3
index 5f5dab5..4cfeb69 100644
@@ -28,10 +28,11 @@ SPROGS=		mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
 USPROGS=	mklost+found filefrag $(UUIDD_PROG)
 SMANPAGES=	tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
 			e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
-			logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+			logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@ \
+			e4defrag.8
 FMANPAGES=	mke2fs.conf.5
 
-UPROGS=		chattr lsattr @UUID_CMT@ uuidgen
+UPROGS=		chattr lsattr @UUID_CMT@ uuidgen e4defrag
 UMANPAGES=	chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
 
 LPROGS=		@E2INITRD_PROG@
@@ -99,7 +100,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 @PROFILE_CMT@	$(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
-	$(FMANPAGES) $(LPROGS) e4defrag
+	$(FMANPAGES) $(LPROGS)
 
 @PROFILE_CMT@all:: tune2fs.profiled blkid.profiled e2image.profiled \
 	e2undo.profiled mke2fs.profiled dumpe2fs.profiled fsck.profiled \
author
#3 lore raw

Hi, Eric

Quoted 11 lines · Eric Sandeen
Quoted 4 lines · Peng Tao

Current Makefile does not install e4defrag nor e4defrag.8. Change misc/Makefile.in to make the e4defrag available for use.

Since this is all still fairly developmental at this point (I think?) perhaps a special "make install-e4defrag" target might be best.

Otherwise packages which "make install" will start shipping e4defrag, and I'm not sure we want to do that quite yet.

Thanks for your reviewing. Does the following patch meet your expectation?

Quoted 1 line

From 248322ee72e371dcd1b302400d787f9f2eec15cd Mon Sep 17 00:00:00 2001

From: Peng Tao <[email protected]>
Date: Mon, 20 Jul 2009 12:01:55 +0800
Subject: [PATCH-e2fsprogs] Makefile.in: add install-e4defrag target

The e4defrag program is still developmental, but we can make it available for use if someone wants to test it.

---
 Makefile.in      |    3 +++
 misc/Makefile.in |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
Makefile.in +3 -0
index 45f2972..1c2b44e 100644
@@ -57,6 +57,9 @@ clean-doc:
 distclean-doc:
 	-test -d doc && cd doc && $(MAKE) distclean
 
+install-e4defrag: subs all-libs-recursive
+	$(MAKE) -C misc install-e4defrag
+
 install: subs all-libs-recursive install-progs-recursive \
   install-shlibs-libs-recursive install-doc-libs
 	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
misc/Makefile.in +5 -1
index 5f5dab5..029a201 100644
@@ -399,6 +399,10 @@ installdirs:
 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
 		$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
 
+install-e4defrag: e4defrag e4defrag.8 installdirs
+	$(INSTALL_PROGRAM) e4defrag $(DESTDIR)$(bindir)/e4defrag
+	$(INSTALL_DATA) e4defrag.8 $(DESTDIR)$(man8dir)/e4defrag.8
+
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
 	$(Q) for i in $(SPROGS); do \
 		echo "	INSTALL $(root_sbindir)/$$i"; \
@@ -556,7 +560,7 @@ clean:
 		blkid.profiled tune2fs.profiled e2image.profiled \
 		e2undo.profiled mke2fs.profiled dumpe2fs.profiled \
 		logsave.profiled filefrag.profiled uuidgen.profiled \
-		uuidd.profiled e2image.profiled \
+		uuidd.profiled e2image.profiled e4defrag \
 		profiled/*.o \#* *.s *.o *.a *~ core gmon.out
 
 mostlyclean: clean
Signature · 9 lines
1.6.2-rc2.GIT



-- 
Best Regards,
Peng Tao
State Key Laboratory of Networking and Switching Technology
Beijing Univ. of Posts and Telecoms.
#4 lore raw
Quoted 9 lines · Peng Tao

From 248322ee72e371dcd1b302400d787f9f2eec15cd Mon Sep 17 00:00:00 2001
From: Peng Tao <[email protected]>
Date: Mon, 20 Jul 2009 12:01:55 +0800
Subject: [PATCH-e2fsprogs] Makefile.in: add install-e4defrag target

The e4defrag program is still developmental, but we can make it available for use if someone wants to test it.

I like this better, thanks! I'll ask on the ext4 call today if others concur.

-Eric

Quoted 43 lines
---
 Makefile.in      |    3 +++
 misc/Makefile.in |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
Makefile.in +3 -0
index 45f2972..1c2b44e 100644
@@ -57,6 +57,9 @@ clean-doc:
 distclean-doc:
 	-test -d doc && cd doc && $(MAKE) distclean
 
+install-e4defrag: subs all-libs-recursive
+	$(MAKE) -C misc install-e4defrag
+
 install: subs all-libs-recursive install-progs-recursive \
   install-shlibs-libs-recursive install-doc-libs
 	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
misc/Makefile.in +5 -1
index 5f5dab5..029a201 100644
@@ -399,6 +399,10 @@ installdirs:
 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
 		$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
 
+install-e4defrag: e4defrag e4defrag.8 installdirs
+	$(INSTALL_PROGRAM) e4defrag $(DESTDIR)$(bindir)/e4defrag
+	$(INSTALL_DATA) e4defrag.8 $(DESTDIR)$(man8dir)/e4defrag.8
+
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
 	$(Q) for i in $(SPROGS); do \
 		echo "	INSTALL $(root_sbindir)/$$i"; \
@@ -556,7 +560,7 @@ clean:
 		blkid.profiled tune2fs.profiled e2image.profiled \
 		e2undo.profiled mke2fs.profiled dumpe2fs.profiled \
 		logsave.profiled filefrag.profiled uuidgen.profiled \
-		uuidd.profiled e2image.profiled \
+		uuidd.profiled e2image.profiled e4defrag \
 		profiled/*.o \#* *.s *.o *.a *~ core gmon.out
 
 mostlyclean: clean