From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>,
qemu-s390x@nongnu.org, Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org
Subject: [PULL 10/14] pc-bios/s390-ccw: Generate and include dependency files in the Makefile
Date: Fri, 3 Jul 2020 12:06:46 +0200 [thread overview]
Message-ID: <20200703100650.621212-11-cohuck@redhat.com> (raw)
In-Reply-To: <20200703100650.621212-1-cohuck@redhat.com>
From: Thomas Huth <thuth@redhat.com>
The Makefile of the s390-ccw bios does not handle dependencies of the
*.c files from the headers yet, so that you often have to run a "make
clean" to get the build right when one of the headers has been changed.
Let's make sure that we generate and include dependency files for all
*.c files now to avoid this problem in the future.
Acked-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200630142955.7662-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/Makefile | 3 +++
pc-bios/s390-ccw/netboot.mak | 13 +++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index a048b6b077a9..50bc8802724f 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -38,5 +38,8 @@ s390-netboot.img:
@echo "s390-netboot.img not built since roms/SLOF/ is not available."
endif
+ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
+-include $(ALL_OBJS:%.o=%.d)
+
clean:
rm -f *.o *.d *.img *.elf *~ *.a
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index 5eefb7c28939..577c023afe3d 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,8 +1,7 @@
SLOF_DIR := $(SRC_PATH)/roms/SLOF
-NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o \
- libnet.a libc.a
+NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o
LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
@@ -11,15 +10,16 @@ NETLDFLAGS := $(LDFLAGS) -Ttext=0x7800000
$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
-s390-netboot.elf: $(NETOBJS)
- $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $(NETOBJS),"BUILD","$(TARGET_DIR)$@")
+s390-netboot.elf: $(NETOBJS) libnet.a libc.a
+ $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $^,"BUILD","$(TARGET_DIR)$@")
s390-netboot.img: s390-netboot.elf
$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
# libc files:
-LIBC_CFLAGS := $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC)
+LIBC_CFLAGS = $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
+ -MMD -MP -MT $@ -MF $(@:%.o=%.d)
CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
@@ -52,7 +52,8 @@ libc.a: $(LIBCOBJS)
LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
-LIBNETCFLAGS := $(QEMU_CFLAGS) $(CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC)
+LIBNETCFLAGS = $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
+ -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
%.o : $(SLOF_DIR)/lib/libnet/%.c
$(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
--
2.25.4
next prev parent reply other threads:[~2020-07-03 10:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 10:06 [PULL 00/14] s390x update Cornelia Huck
2020-07-03 10:06 ` [PULL 01/14] pc-bios: s390x: cio.c cleanup and compile fix Cornelia Huck
2020-07-03 10:06 ` [PULL 02/14] pc-bios: s390x: Consolidate timing functions into time.h Cornelia Huck
2020-07-03 10:06 ` [PULL 03/14] pc-bios: s390x: Move sleep and yield to helper.h Cornelia Huck
2020-07-03 10:06 ` [PULL 04/14] pc-bios: s390x: Get rid of magic offsets into the lowcore Cornelia Huck
2020-07-03 10:06 ` [PULL 05/14] pc-bios: s390x: Rename PSW_MASK_ZMODE to PSW_MASK_64 Cornelia Huck
2020-07-03 10:06 ` [PULL 06/14] pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR Cornelia Huck
2020-07-03 10:06 ` [PULL 07/14] pc-bios: s390x: Move panic() into header and add infinite loop Cornelia Huck
2020-07-03 10:06 ` [PULL 08/14] pc-bios: s390x: Use ebcdic2ascii table Cornelia Huck
2020-07-03 10:06 ` [PULL 09/14] pc-bios: s390x: Make u32 ptr check explicit Cornelia Huck
2020-07-03 10:06 ` Cornelia Huck [this message]
2020-07-03 10:06 ` [PULL 11/14] pc-bios/s390: Update s390-ccw bios binaries with the latest changes Cornelia Huck
2020-07-03 10:06 ` [PULL 12/14] target/s390x: Fix SQXBR Cornelia Huck
2020-07-03 10:06 ` [PULL 13/14] virtio-ccw: fix virtio_set_ind_atomic Cornelia Huck
2020-07-06 11:23 ` Halil Pasic
2020-07-06 11:38 ` Cornelia Huck
2020-09-08 9:34 ` Halil Pasic
2020-07-03 10:06 ` [PULL 14/14] s390x/pci: fix set_ind_atomic Cornelia Huck
2020-07-06 11:23 ` Halil Pasic
2020-09-08 9:36 ` Halil Pasic
2020-07-03 10:46 ` [PULL 00/14] s390x update no-reply
2020-07-04 13:58 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200703100650.621212-11-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).