RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: build, do not install everything by default 

Commit 878affd47d ("btrfs-progs: build more utilities by default")
resulted in installation of new utilities, that were not installed
before. Make them build but do not install them.

Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
David Sterba 2015-02-05 15:46:42 +01:00
parent dfbbe312ad
commit 9b31d84fce
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.in
View File

@ -69,17 +69,21 @@ endif
MAKEOPTS = --no-print-directory Q=$(Q) MAKEOPTS = --no-print-directory Q=$(Q)
progs = mkfs.btrfs btrfs-debug-tree btrfsck \ # build all by default
btrfs btrfs-map-logical btrfs-image btrfs-zero-log \ progs = $(progs_install) btrfsck btrfs-corrupt-block btrfs-calc-size
# install only selected
progs_install = btrfs mkfs.btrfs btrfs-debug-tree \
btrfs-map-logical btrfs-image btrfs-zero-log \
btrfs-find-root btrfstune btrfs-show-super \ btrfs-find-root btrfstune btrfs-show-super \
btrfs-corrupt-block btrfs-select-super btrfs-calc-size btrfs-select-super
progs_extra = btrfs-fragments progs_extra = btrfs-fragments
progs_static = $(foreach p,$(progs),$(p).static) progs_static = $(foreach p,$(progs),$(p).static)
ifneq ($(DISABLE_BTRFSCONVERT),1) ifneq ($(DISABLE_BTRFSCONVERT),1)
progs += btrfs-convert progs_install += btrfs-convert
endif endif
# external libs required by various binaries; for btrfs-foo, # external libs required by various binaries; for btrfs-foo,
@ -314,9 +318,9 @@ $(CLEANDIRS):
@echo "Cleaning $(patsubst clean-%,%,$@)" @echo "Cleaning $(patsubst clean-%,%,$@)"
$(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst clean-%,%,$@) clean $(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst clean-%,%,$@) clean
install: $(libs) $(progs) $(INSTALLDIRS) install: $(libs) $(progs_install) $(INSTALLDIRS)
$(INSTALL) -m755 -d $(DESTDIR)$(bindir) $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
$(INSTALL) $(progs) $(DESTDIR)$(bindir) $(INSTALL) $(progs_install) $(DESTDIR)$(bindir)
$(INSTALL) fsck.btrfs $(DESTDIR)$(bindir) $(INSTALL) fsck.btrfs $(DESTDIR)$(bindir)
# btrfsck is a link to btrfs in the src tree, make it so for installed file as well # btrfsck is a link to btrfs in the src tree, make it so for installed file as well
$(LN_S) -f btrfs $(DESTDIR)$(bindir)/btrfsck $(LN_S) -f btrfs $(DESTDIR)$(bindir)/btrfsck
@ -340,7 +344,7 @@ uninstall:
cd $(DESTDIR)$(incdir); $(RM) -f $(headers) cd $(DESTDIR)$(incdir); $(RM) -f $(headers)
$(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(incdir) $(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(incdir)
cd $(DESTDIR)$(libdir); $(RM) -f $(lib_links) $(libs) cd $(DESTDIR)$(libdir); $(RM) -f $(lib_links) $(libs)
cd $(DESTDIR)$(bindir); $(RM) -f btrfsck fsck.btrfs $(progs) cd $(DESTDIR)$(bindir); $(RM) -f btrfsck fsck.btrfs $(progs_install)
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include $(objects:.o=.o.d) $(cmd-objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d))) -include $(objects:.o=.o.d) $(cmd-objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d)))