From 27693033ea1591d655eb570b3ea6fc69154107b0 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Thu, 28 Jul 2005 21:16:03 -0700 Subject: [PATCH] --- yaml --- r: 5405 b: refs/heads/master c: 8afe07ce0003d4c63b7d76b6f28264503cb80d71 h: refs/heads/master i: 5403: f09ded1010a085b27834dba137bd7b73982bf9d6 v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57dca14afb4a..5ab4a5bf9988 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b85e9680a33ae2df04bd493f220a76dcf183ce80 +refs/heads/master: 8afe07ce0003d4c63b7d76b6f28264503cb80d71 diff --git a/trunk/arch/um/drivers/Makefile b/trunk/arch/um/drivers/Makefile index d6c31a95b887..de17d4c6e02d 100644 --- a/trunk/arch/um/drivers/Makefile +++ b/trunk/arch/um/drivers/Makefile @@ -19,6 +19,8 @@ harddog-objs := harddog_kern.o harddog_user.o LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a) +targets := pcap_kern.o pcap_user.o + $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o) #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 #$(call if_changed,ld) # When the above is fixed, don't forget to add this too! -#targets := $(obj)/pcap.o +#targets += $(obj)/pcap.o obj-y := stdio_console.o fd.o chan_kern.o chan_user.o line.o obj-$(CONFIG_SSL) += ssl.o