btrfs-progs: remove hard-coding of "gcc" and "make" from Makefile
Subsystems (2)
PATCH 1/1 btrfs-progs: remove hard-coding of "gcc" and "make" from Makefile
Here's a simple patch to replace "gcc" with "$(CC)" and "make" with "$(MAKE)". This is required, for example, for Gentoo Linux ebuilds, and it also eliminates a "jobserver unavailable" warning (make-related).
-Joe
Makefile +14 -14
@@ -36,47 +36,47 @@ version: bash version.sh btrfsctl: $(objects) btrfsctl.o - gcc $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) btrfs-vol: $(objects) btrfs-vol.o - gcc $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) btrfs-show: $(objects) btrfs-show.o - gcc $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) btrfsck: $(objects) btrfsck.o - gcc $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) mkfs.btrfs: $(objects) mkfs.o - gcc $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) btrfs-debug-tree: $(objects) debug-tree.o - gcc $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) btrfstune: $(objects) btrfstune.o - gcc $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) btrfs-image: $(objects) btrfs-image.o - gcc $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) dir-test: $(objects) dir-test.o - gcc $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) quick-test: $(objects) quick-test.o - gcc $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) convert: $(objects) convert.o - gcc $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS) manpages: - cd man; make + cd man; $(MAKE) install-man: - cd man; make install + cd man; $(MAKE) install clean : rm -f $(progs) cscope.out *.o .*.d btrfs-convert - cd man; make clean + cd man; $(MAKE) clean install: $(progs) install-man $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
Hi
Quoted 7 lines · Joe Peterson
Date: Mon, 21 Sep 2009 10:18:53 -0600
From: Joe Peterson <[email protected]>
To: Btrfs Development List <[email protected]>
Subject: [PATCH] btrfs-progs: remove hard-coding of "gcc" and "make" from
Makefile
User-Agent: Thunderbird 2.0.0.23 (X11/20090920)
List-ID: <linux-btrfs.vger.kernel.org>
BTW:
Makefile version: · line 72
Quoted 4 lines
manpages:
Makefile +1
-1- cd man; make + cd man; $(MAKE)
=> $(MAKE) -C man
Makefile version: · line 75
Quoted 4 lines
install-man:
Makefile +1
-1- cd man; make install + cd man; $(MAKE) install
=> $(MAKE) -C man install
Makefile version: · line 79
Quoted 5 lines
clean :
Makefile +1
-1rm -f $(progs) cscope.out *.o .*.d btrfs-convert - cd man; make clean + cd man; $(MAKE) clean
=> $(MAKE) clean
Signature · 3 lines
Premysl "Anydot" Hruby, http://www.redrum.cz/ - I'm a signature virus. Please add me to your signature and help me spread!