mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
Commit 62ec87680a61 ("common.mak: improve cross compilation support")
added one extra whitespace during the changes of the toolchain command
definitions. The rest of the commands did not receive that change.
Since then the pretty print output looks like this:
...
CC zipl/boot/eckd1b.o
CXX ziomon/ziorep_collapser.o
SED zdev/src/lszdev_usage.c
CC hyptop/sd_cpu_items.o
MV zfcpdump/zfcpdump-initrd
LINK dasdfmt/dasdfmt
...
Add the additional whitespace to all other tools definitions used during
the build process.
Note: This doesn't fix the misaligned indentation for commands like
$(CC_FOR_BUILD) as those inherit the whitespace from the original
command, here $(CC).
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
59 lines
1.2 KiB
Makefile
59 lines
1.2 KiB
Makefile
include ../common.mak
|
|
|
|
CPIOINIT = $(call echocmd," CPIOINI ",/$@)./cpioinit
|
|
INSTALL_SCRIPTS = 10-zfcpdump.install
|
|
|
|
ALL_CFLAGS += -fno-sanitize=all
|
|
ALL_LDFLAGS += -fno-sanitize=all
|
|
|
|
ifeq (${HAVE_LIBC_STATIC},0)
|
|
|
|
all:
|
|
$(SKIP) HAVE_LIBC_STATIC=0
|
|
|
|
install:
|
|
$(SKIP) HAVE_LIBC_STATIC=0
|
|
|
|
else
|
|
|
|
check_dep:
|
|
$(call check_dep, \
|
|
"zfcpdump", \
|
|
"stdio.h", \
|
|
"glibc-static or libc-dev", \
|
|
"HAVE_LIBC_STATIC=0", \
|
|
"-static")
|
|
|
|
all: check_dep $(ZFCPDUMP_INITRD) scripts
|
|
|
|
cpioinit: cpioinit.c
|
|
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $^
|
|
|
|
zfcpdump_part: zfcpdump.o zfcpdump_part.o
|
|
$(LINK) $(ALL_LDFLAGS) $^ -static -o $@
|
|
$(STRIP) -s $@
|
|
|
|
$(ZFCPDUMP_INITRD): cpioinit zfcpdump_part
|
|
$(CPIOINIT) zfcpdump_part > $@.tmp
|
|
$(GZIP) -f $@.tmp
|
|
$(MV) $@.tmp.gz $(ZFCPDUMP_INITRD)
|
|
|
|
scripts: $(INSTALL_SCRIPTS)
|
|
chmod +x $(INSTALL_SCRIPTS)
|
|
|
|
install: all
|
|
$(INSTALL) -m 611 $(ZFCPDUMP_INITRD) $(DESTDIR)$(ZFCPDUMP_DIR)
|
|
|
|
%: %.in
|
|
zfcpdump_image=$(ZFCPDUMP_DIR)/$(ZFCPDUMP_IMAGE); \
|
|
$(SED) -e "s#@zfcpdump_image@#$$zfcpdump_image#g" \
|
|
-e "s#@flavor@#$(ZFCPDUMP_FLAVOR)#g" \
|
|
< $< > $@
|
|
endif
|
|
|
|
clean:
|
|
rm -f *.o *.gz *.tmp *~ zfcpdump_part cpioinit $(ZFCPDUMP_INITRD) \
|
|
$(INSTALL_SCRIPTS)
|
|
|
|
.PHONY: all clean install check_dep scripts
|