Skip to content

Commit ad4f0f9

Browse files
kitsunyankitsunyan
committed
Apply silent rules
1 parent b0ce7e5 commit ad4f0f9

File tree

5 files changed

+34
-26
lines changed

5 files changed

+34
-26
lines changed

‎configure.ac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
AC_INIT([systemd-boot-password], [0.9.4.232])
22

33
AC_CONFIG_MACRO_DIR([m4])
4-
AC_CONFIG_AUX_DIR([build-aux])
54
AC_CONFIG_HEADERS([config.h])
65

76
AC_CONFIG_FILES([
@@ -13,7 +12,7 @@ AC_CONFIG_FILES([
1312
src/efi/Makefile
1413
])
1514

16-
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz])
15+
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
1716
AM_SILENT_RULES([yes])
1817

1918
AC_CANONICAL_HOST

‎man/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ XSLTPROC_FLAGS = \
1010
--stringparam man.copyright.section.enabled 0
1111

1212
%.1: %.xml
13-
$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
14-
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
13+
$(AM_V_GEN) $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) \
14+
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
1515

1616
CLEANFILES = \
1717
$(man_MANS)

‎src/Makefile.am

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ bin_SCRIPTS = \
55
sbpctl
66

77
sbpctl:
8-
sed -e 's,[@]BOOT_LIB_DIR[@],$(bootlibdir),g' \
9-
-e 's,[@]EFI_MACHINE_TYPE_NAME[@],$(EFI_MACHINE_TYPE_NAME),g' \
10-
< sbpctl.in > sbpctl
11-
chmod a+x sbpctl
8+
$(AM_V_GEN) sed \
9+
-e 's,[@]BOOT_LIB_DIR[@],$(bootlibdir),g' \
10+
-e 's,[@]EFI_MACHINE_TYPE_NAME[@],$(EFI_MACHINE_TYPE_NAME),g' \
11+
< sbpctl.in > sbpctl
12+
@chmod a+x sbpctl
1213

1314
CLEANFILES = \
1415
$(bin_SCRIPTS)

‎src/efi/Makefile.am

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
AM_V_CC = $(am__v_CC_$(V))
2+
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
3+
am__v_CC_0 = @echo " CC " $@;
4+
5+
AM_V_CCLD = $(am__v_CCLD_$(V))
6+
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
7+
am__v_CCLD_0 = @echo " CCLD " $@;
8+
19
CLEANFILES =
210
bootlib_DATA =
311

@@ -87,16 +95,16 @@ systemd_boot_solib = systemd_boot.so
8795
systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi
8896

8997
$(systemd_boot): $(systemd_boot_solib)
90-
$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
91-
-j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
98+
$(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
99+
-j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
92100

93101
$(systemd_boot_solib): $(systemd_boot_objects)
94-
$(LD) $(efi_ldflags) $(systemd_boot_objects) \
95-
-o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name);
96-
nm -D -u $@ | grep ' U ' && exit 1 || :
102+
$(AM_V_CCLD) $(LD) $(efi_ldflags) $(systemd_boot_objects) \
103+
-o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name);
104+
@nm -D -u $@ | grep ' U ' && exit 1 || :
97105

98106
%.o: %.c $(systemd_boot_headers)
99-
$(CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
107+
$(AM_V_CC) $(CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
100108

101109
bootlib_DATA += \
102110
$(systemd_boot)
@@ -127,19 +135,19 @@ systemd_boot_stub_sources = \
127135

128136
systemd_boot_stub_objects = $(systemd_boot_stub_sources:.c=.o)
129137
systemd_boot_stub_solib = systemd_boot_stub.so
130-
systemd_boot_stub = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi.stub
138+
systemd_boot_stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub
131139

132140
$(systemd_boot_stub): $(systemd_boot_stub_solib)
133-
$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
134-
-j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
141+
$(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
142+
-j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
135143

136144
$(systemd_boot_stub_solib): $(systemd_boot_stub_objects)
137-
$(LD) $(efi_ldflags) $(systemd_boot_stub_objects) \
138-
-o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name);
139-
nm -D -u $@ | grep ' U ' && exit 1 || :
145+
$(AM_V_CCLD) $(LD) $(efi_ldflags) $(systemd_boot_stub_objects) \
146+
-o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
147+
@nm -D -u $@ | grep ' U ' && exit 1 || :
140148

141149
%.o: %.c $(systemd_boot_stub_headers)
142-
$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
150+
$(AM_V_CC) $(CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
143151

144152
bootlib_DATA += \
145153
$(systemd_boot_stub)

‎src/sbpctl.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ BOOT_LIB_DIR="@BOOT_LIB_DIR@"
44
EFI_MACHINE_TYPE_NAME="@EFI_MACHINE_TYPE_NAME@"
55

66
EFI_DEFAULT="/EFI/BOOT/BOOT${EFI_MACHINE_TYPE_NAME^^}.EFI"
7-
EFI_SYSTEMD="/EFI/systemd/systemd-boot$EFI_MACHINE_TYPE_NAME.efi"
7+
EFI_SBP="/EFI/systemd/systemd-boot$EFI_MACHINE_TYPE_NAME.efi"
88

99
DB_KEY="/etc/sbp/db.key"
1010
DB_CERT="/etc/sbp/db.crt"
@@ -166,8 +166,8 @@ case "$1" in
166166
sign "$esp$EFI_DEFAULT" || exit 1
167167
}
168168
[ -z "$default" ] && {
169-
bootmkdir "$esp$EFI_SYSTEMD" "Can not create EFI/systemd directory." || exit 1
170-
cp "$esp$EFI_DEFAULT" "$esp$EFI_SYSTEMD" || {
169+
bootmkdir "$esp$EFI_SBP" "Can not create EFI/systemd directory." || exit 1
170+
cp "$esp$EFI_DEFAULT" "$esp$EFI_SBP" || {
171171
echo "Can not copy EFI application." 1>&2
172172
exit 1
173173
}
@@ -198,14 +198,14 @@ case "$1" in
198198
--add-section .cmdline="$cmdline" --change-section-vma .cmdline=0x30000 \
199199
--add-section .linux="$efi" --change-section-vma .linux=0x40000 \
200200
--add-section .initrd="$initrd" --change-section-vma .initrd=0x3000000 \
201-
"$BOOT_LIB_DIR/systemd-boot$EFI_MACHINE_TYPE_NAME.efi.stub" "$output" || {
201+
"$BOOT_LIB_DIR/linux$EFI_MACHINE_TYPE_NAME.efi.stub" "$output" || {
202202
echo "Can not create EFI application." 1>&2
203203
exit 1
204204
}
205205
} || {
206206
objcopy --add-section .linux="$efi" --change-section-vma .linux=0x40000 \
207207
--add-section .initrd="$initrd" --change-section-vma .initrd=0x3000000 \
208-
"$BOOT_LIB_DIR/systemd-boot$EFI_MACHINE_TYPE_NAME.efi.stub" "$output" || {
208+
"$BOOT_LIB_DIR/linux$EFI_MACHINE_TYPE_NAME.efi.stub" "$output" || {
209209
echo "Can not create EFI application." 1>&2
210210
exit 1
211211
}

0 commit comments

Comments
 (0)