Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

Commit b86b176

Browse files
committed
Use automatic variables in makefile recipies
1 parent 504efa1 commit b86b176

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

Makefile

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,62 +41,62 @@ reset:
4141
'$(BOOTFS_MOUNTDIR)' '$(BOOTFS_IMAGE)'
4242

4343
$(MUSL_DIR):
44-
git clone --depth=1 '$(MUSL_SOURCE)' '$(MUSL_DIR)'
44+
git clone --depth=1 '$(MUSL_SOURCE)' '$@'
4545

4646
$(MUSL_BUILD_DIR): | $(LINUX_HEADERS_DIR)
47-
rm -rf '$(MUSL_BUILD_DIR)'
47+
rm -rf '$@'
4848

49-
mkdir '$(MUSL_BUILD_DIR)' \
50-
'$(MUSL_BUILD_DIR)'/bin \
51-
'$(MUSL_BUILD_DIR)'/include \
52-
'$(MUSL_BUILD_DIR)'/lib
49+
mkdir '$@' \
50+
'$@'/bin \
51+
'$@'/include \
52+
'$@'/lib
5353

5454
# These symlinks ensure that programs and headers required for building BusyBox
5555
# under musl are present (besides musl-gcc).
5656
# Refer: https://www.openwall.com/lists/musl/2014/08/08/13
57-
ln -s "$$(which as)" '$(MUSL_BUILD_DIR)'/bin/musl-as
58-
ln -s "$$(which ar)" '$(MUSL_BUILD_DIR)'/bin/musl-ar
59-
ln -s "$$(which nm)" '$(MUSL_BUILD_DIR)'/bin/musl-nm
60-
ln -s "$$(which strip)" '$(MUSL_BUILD_DIR)'/bin/musl-strip
61-
ln -s "$$(which objcopy)" '$(MUSL_BUILD_DIR)'/bin/musl-objcopy
62-
ln -s "$$(which objdump)" '$(MUSL_BUILD_DIR)'/bin/musl-objdum
63-
ln -s "$$(which pkg-config)" '$(MUSL_BUILD_DIR)'/bin/musl-pkg-config
64-
ln -s '../../$(LINUX_HEADERS_DIR)/include/linux' '$(MUSL_BUILD_DIR)'/include/linux
65-
ln -s '../../$(LINUX_HEADERS_DIR)/include/mtd' '$(MUSL_BUILD_DIR)'/include/mtd
66-
ln -s '../../$(LINUX_HEADERS_DIR)/include/asm' '$(MUSL_BUILD_DIR)'/include/asm
67-
ln -s '../../$(LINUX_HEADERS_DIR)/include/asm-generic' '$(MUSL_BUILD_DIR)'/include/asm-generic
57+
ln -s "$$(which as)" '$@'/bin/musl-as
58+
ln -s "$$(which ar)" '$@'/bin/musl-ar
59+
ln -s "$$(which nm)" '$@'/bin/musl-nm
60+
ln -s "$$(which strip)" '$@'/bin/musl-strip
61+
ln -s "$$(which objcopy)" '$@'/bin/musl-objcopy
62+
ln -s "$$(which objdump)" '$@'/bin/musl-objdum
63+
ln -s "$$(which pkg-config)" '$@'/bin/musl-pkg-config
64+
ln -s '../../$(LINUX_HEADERS_DIR)/include/linux' '$@'/include/linux
65+
ln -s '../../$(LINUX_HEADERS_DIR)/include/mtd' '$@'/include/mtd
66+
ln -s '../../$(LINUX_HEADERS_DIR)/include/asm' '$@'/include/asm
67+
ln -s '../../$(LINUX_HEADERS_DIR)/include/asm-generic' '$@'/include/asm-generic
6868

6969
$(MUSL_GCC): | $(MUSL_DIR) $(MUSL_BUILD_DIR)
7070
$(MAKE) -C '$(MUSL_DIR)' -j "$$(nproc)" all
7171
$(MAKE) -C '$(MUSL_DIR)' install
7272

7373
.PHONY: musl-update
7474
musl-update: $(MUSL_DIR)
75-
git -C '$(MUSL_DIR)' pull
75+
git -C '$<' pull
7676

7777
.PHONY: musl-configure
7878
musl-configure: $(MUSL_DIR)
79-
cd '$(MUSL_DIR)' && ./configure --prefix=../'$(MUSL_BUILD_DIR)'
79+
cd '$<' && ./configure --prefix=../'$(MUSL_BUILD_DIR)'
8080

8181
.PHONY: musl-clean
8282
musl-clean:
8383
[ -d '$(MUSL_DIR)' ] && $(MAKE) -C '$(MUSL_DIR)' distclean
8484
rm -rf '$(MUSL_BUILD_DIR)'
8585

8686
$(BUSYBOX_DIR):
87-
git clone --depth=1 '$(BUSYBOX_SOURCE)' '$(BUSYBOX_DIR)'
87+
git clone --depth=1 '$(BUSYBOX_SOURCE)' '$@'
8888

8989
$(BUSYBOX): $(BUSYBOX_DIR)/.config $(MUSL_GCC) | $(BUSYBOX_DIR)
90-
$(MAKE) -C '$(BUSYBOX_DIR)' -j "$$(nproc)" CC=../$(MUSL_GCC) all
90+
$(MAKE) -C '$(<D)' -j "$$(nproc)" CC=../$(MUSL_GCC) all
9191

9292
.PHONY: busybox-update
9393
busybox-update: $(BUSYBOX_DIR)
94-
git -C '$(BUSYBOX_DIR)' pull
94+
git -C '$<' pull
9595

9696
.PHONY: busybox-configure
9797
busybox-configure: $(BUSYBOX_DIR)
98-
cp '$(BUSYBOX_CONFIG)' '$(BUSYBOX_DIR)'/.config
99-
$(MAKE) -C '$(BUSYBOX_DIR)' CC=../$(MUSL_GCC) oldconfig
98+
cp '$(BUSYBOX_CONFIG)' '$<'/.config
99+
$(MAKE) -C '$<' CC=../$(MUSL_GCC) oldconfig
100100

101101
.PHONY: busybox-clean
102102
busybox-clean:
@@ -135,23 +135,23 @@ rootfs-clean:
135135
rm -rf '$(ROOTFS_DIR)' '$(ROOTFS_CPIO)'
136136

137137
$(LINUX_DIR):
138-
git clone --depth=1 '$(LINUX_SOURCE)' '$(LINUX_DIR)'
138+
git clone --depth=1 '$(LINUX_SOURCE)' '$@'
139139

140140
$(LINUX_HEADERS_DIR): | $(LINUX_DIR)
141141
$(MAKE) -C '$(LINUX_DIR)' \
142-
headers_install INSTALL_HDR_PATH=../'$(LINUX_HEADERS_DIR)'
142+
headers_install INSTALL_HDR_PATH=../'$@'
143143

144144
$(LINUX_BZIMAGE): $(LINUX_DIR)/.config $(ROOTFS_CPIO) | $(LINUX_DIR)
145-
$(MAKE) -C '$(LINUX_DIR)' -j "$$(nproc)" bzImage
145+
$(MAKE) -C '$(<D)' -j "$$(nproc)" bzImage
146146

147147
.PHONY: linux-update
148148
linux-update: $(LINUX_DIR)
149-
git -C '$(LINUX_DIR)' pull
149+
git -C '$<' pull
150150

151151
.PHONY: linux-configure
152152
linux-configure: $(LINUX_DIR)
153-
cp '$(LINUX_CONFIG)' '$(LINUX_DIR)'/.config
154-
$(MAKE) -C '$(LINUX_DIR)' oldconfig
153+
cp '$(LINUX_CONFIG)' '$<'/.config
154+
$(MAKE) -C '$<' oldconfig
155155

156156
.PHONY: linux-clean
157157
linux-clean:
@@ -182,7 +182,7 @@ cleanup 0
182182
endef
183183
export BOOTFS_BUILD_CMDS := $(value _BOOTFS_BUILD_CMDS)
184184
$(BOOTFS_IMAGE): $(LINUX_BZIMAGE)
185-
dd if=/dev/zero of='$(BOOTFS_IMAGE)' \
185+
dd if=/dev/zero of='$@' \
186186
bs=1024 count='$(BOOTFS_SIZE)' conv=fsync
187187
# losetup, mount and mkfs.fat likely require actual root privileges.
188188
echo "$${BOOTFS_BUILD_CMDS}" | sudo -s

0 commit comments

Comments
 (0)