diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-12-06 09:16:14 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-06 09:16:14 +0000 |
| commit | 8a4cbfe4e291a9785b09d788b999be2abf3af4cf (patch) | |
| tree | a49f573eda5605d67c989da3d8ed29192caafa42 /packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch | |
| parent | 56e3cfd5bc911e4e47ae00c8bafb785d48b0b7c5 (diff) | |
| parent | 3eb8eb685e9192a2d844f071cd121b47b839ddea (diff) | |
merge of 2812814e008a70fdc0a1a8e0c011f96d8f67b57b
and 477a6d0aedc8faf8f5a2d9cc48fd1855759d7313
Diffstat (limited to 'packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch')
| -rw-r--r-- | packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch index 8c72408a99..c90c778703 100644 --- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch +++ b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/makefile.patch @@ -1,5 +1,6 @@ ---- atmelwlandriver/src/Pcmcia_Pci/Makefile.old 2005-02-06 14:29:48.000000000 +0000 -+++ atmelwlandriver/src/Pcmcia_Pci/Makefile 2005-02-06 14:30:01.000000000 +0000 +diff -Nurd atmelwlandriver-3.4.1.0/src/Pcmcia_Pci/Makefile atmelwlandriver-3.4.1.0-hh/src/Pcmcia_Pci/Makefile +--- atmelwlandriver-3.4.1.0/src/Pcmcia_Pci/Makefile 2004-11-10 01:40:50.000000000 -0800 ++++ atmelwlandriver-3.4.1.0-hh/src/Pcmcia_Pci/Makefile 2005-11-30 11:48:20.830290096 -0800 @@ -65,7 +65,7 @@ @for i in $(PCMCIA-y); do make $$i || exit 1; done @@ -9,3 +10,36 @@ nm $(OBJDIR)/$(MODULE).o |sort -u >$(OBJDIR)/$(patsubst %.o,%.map,$(MODULE).o); rfmdD: +@@ -206,9 +206,9 @@ + + fastvnet_cs.o:fastvnet_cs.c $(INC)/pcmcia/vnet.h + ifeq '$(NEW_KERN)' 'y' +- $(CC) $(CFLAGS) $(NEWKERNFLAGS) $(KMODNAMEFLAG)$(MODULE) -DMODULE -c fastvnet_cs.c -o fastvnet_cs.o ++ $(CC) $(CFLAGS) $(NEWKERNFLAGS) $(KMODNAMEFLAG)$(MODULE) -DMODULE -c fastvnet_cs.c + else +- $(CC) $(CFLAGS) -DMODULE -c fastvnet_cs.c -o fastvnet_cs.o ++ $(CC) $(CFLAGS) -DMODULE -c fastvnet_cs.c + endif + + clean: +diff -Nurd atmelwlandriver-3.4.1.0/src/usb/Makefile atmelwlandriver-3.4.1.0-hh/src/usb/Makefile +--- atmelwlandriver-3.4.1.0/src/usb/Makefile 2004-11-10 01:40:50.000000000 -0800 ++++ atmelwlandriver-3.4.1.0-hh/src/usb/Makefile 2005-11-30 11:48:45.517730782 -0800 +@@ -40,7 +40,7 @@ + for i in $(USB-y); do make $$i || exit 1; done + + final:$(objs) vnetusba.o +- ld -r -o $(OBJDIR)/$(MODULE).o vnetusba.o $(objs) ++ ${LD} -r -o $(OBJDIR)/$(MODULE).o vnetusba.o $(objs) + @nm $(OBJDIR)/$(MODULE).o |sort >../$(patsubst %.o,%.map, $(MODULE).o); + + +@@ -143,7 +143,7 @@ + callbacks.o : $(INC)/usb/$(fws) + vnetusba.o : vnetusba.c $(INC)/usb/vnetusba.h + ifeq '$(NEW_KERN)' 'y' +- $(CC) $(CFLAGS) $(NEWKERNFLAGS) $(KMODNAMEFLAG)$(MODULE) -DMODULE -c vnetusba.c -o vnetusba.o ++ $(CC) $(CFLAGS) $(NEWKERNFLAGS) $(KMODNAMEFLAG)$(MODULE) -DMODULE -c vnetusba.c + else + $(CC) $(CFLAGS) -DMODULE -c vnetusba.c + |