Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5405
b: refs/heads/master
c: 8afe07c
h: refs/heads/master
i:
  5403: f09ded1
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Jul 29, 2005
1 parent cbb9cd8 commit 2769303
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b85e9680a33ae2df04bd493f220a76dcf183ce80
refs/heads/master: 8afe07ce0003d4c63b7d76b6f28264503cb80d71
4 changes: 3 additions & 1 deletion trunk/arch/um/drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ 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
# object name, so nothing from the library gets linked.
#$(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
Expand Down

0 comments on commit 2769303

Please sign in to comment.