aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2005-07-29 00:16:03 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-29 00:46:03 -0400
commit8afe07ce0003d4c63b7d76b6f28264503cb80d71 (patch)
treec92d9bff9c4e94504f90a090b48ffc7eb7fbb99d /arch/um
parentb85e9680a33ae2df04bd493f220a76dcf183ce80 (diff)
[PATCH] uml: avoid unnecessary pcap rebuild
Just a Kbuild subtlety, not listing a target file inside targets causes it to be rebuilt each time, and as a consequence everything depending on it is rebuilt. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
index d6c31a95b887..de17d4c6e02d 100644
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
@@ -19,6 +19,8 @@ harddog-objs := harddog_kern.o harddog_user.o
19 19
20LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a) 20LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a)
21 21
22targets := pcap_kern.o pcap_user.o
23
22$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o 24$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
23 $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o) 25 $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)
24#XXX: The call below does not work because the flags are added before the 26#XXX: The call below does not work because the flags are added before the
@@ -26,7 +28,7 @@ $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
26#$(call if_changed,ld) 28#$(call if_changed,ld)
27 29
28# When the above is fixed, don't forget to add this too! 30# When the above is fixed, don't forget to add this too!
29#targets := $(obj)/pcap.o 31#targets += $(obj)/pcap.o
30 32
31obj-y := stdio_console.o fd.o chan_kern.o chan_user.o line.o 33obj-y := stdio_console.o fd.o chan_kern.o chan_user.o line.o
32obj-$(CONFIG_SSL) += ssl.o 34obj-$(CONFIG_SSL) += ssl.o