]>
Commit | Line | Data |
---|---|---|
ab43d4dc PS |
1 | diff -uNr atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kernelv2.6 |
2 | --- atmelwlandriver.orig/Makefile.kernelv2.6 2004-06-05 06:11:18.000000000 +0200 | |
3 | +++ atmelwlandriver/Makefile.kernelv2.6 2004-07-19 10:45:29.000000000 +0200 | |
4 | @@ -4,15 +4,13 @@ | |
5 | SCRIPTSDIR=$(TOPDIR)/scripts | |
6 | INC=$(TOPDIR)/src/includes | |
9012671a | 7 | VERSION=3.4.0.1 |
ab43d4dc PS |
8 | -MINOR_NUMBER=$(shell uname -r | cut -d . -f 3 | cut -d - -f 1) |
9 | ID:=$(shell id -u) | |
10 | tmpDIR:=/tmp/atm$(shell date +%S.%s) | |
11 | tmpDES:=$(tmpDIR)/atmelwlandriver | |
12 | LVNET = $(shell pwd)/src/apps/cmd_line | |
13 | WINTER = $(shell pwd)/src/apps/winter | |
a486aa77 | 14 | |
ab43d4dc | 15 | -KERNEL_VERSION:=$(shell uname -r) |
9012671a | 16 | -KERNEL_SOURCE:=/lib/modules/$(KERNEL_VERSION)/build |
ab43d4dc PS |
17 | +KERNEL_SOURCE:=/usr/src/linux |
18 | PCMCIA_DES = /lib/modules/$(KERNEL_VERSION)/pcmcia | |
19 | PCI_DES = /lib/modules/$(KERNEL_VERSION)/kernel/drivers/net | |
20 | USB_DES = /lib/modules/$(KERNEL_VERSION)/kernel/drivers/usb | |
21 | @@ -99,34 +97,15 @@ | |
22 | $(all_targets): %: | |
23 | @echo Building $@ | |
24 | @if [ ! -d $(OBJDIR)/$@ ]; then echo Bootstraping target $@; mkdir $(OBJDIR)/$@; fi | |
25 | - @if [ ! -d $(OBJDIR)/$@/debug ]; then \ | |
26 | - mkdir $(OBJDIR)/$@/debug; \ | |
27 | - for f in $(srcs); do (cd $(OBJDIR)/$@/debug; ln -s $(SUBDIRS)/$$f .); done \ | |
28 | - fi | |
29 | @if [ ! -d $(OBJDIR)/$@/release ]; then \ | |
30 | mkdir $(OBJDIR)/$@/release; \ | |
31 | for f in $(srcs); do (cd $(OBJDIR)/$@/release; ln -s $(SUBDIRS)/$$f .); done \ | |
32 | fi | |
33 | - @echo -e "\tDebug" | |
34 | - @if [ "$(buildonly)" == debug ] || [ "$(buildonly)" == "" ]; then \ | |
35 | - echo obj-m=$@.o > $(OBJDIR)/$@/debug/Makefile; \ | |
36 | - echo all: >> $(OBJDIR)/$@/debug/Makefile; \ | |
37 | - if [ "$(MINOR_NUMBER)" -gt "5" ]; then \ | |
38 | - echo -e $(debug_submake_new) >> $(OBJDIR)/$@/debug/Makefile; \ | |
39 | - else \ | |
40 | - echo -e $(debug_submake_old) >> $(OBJDIR)/$@/debug/Makefile; \ | |
41 | - fi;\ | |
42 | - (cd $(OBJDIR)/$@/debug; make) ; \ | |
43 | - fi | |
44 | @echo -e "\tRelease" | |
45 | @if [ "$(buildonly)" == release ] || [ "$(buildonly)" == "" ]; then \ | |
46 | echo obj-m=$@.o > $(OBJDIR)/$@/release/Makefile; \ | |
47 | echo all: >> $(OBJDIR)/$@/release/Makefile; \ | |
48 | - if [ "$(MINOR_NUMBER)" -gt "5" ]; then \ | |
49 | - echo -e $(release_submake_new) >> $(OBJDIR)/$@/release/Makefile; \ | |
50 | - else \ | |
51 | - echo -e $(release_submake_old) >> $(OBJDIR)/$@/release/Makefile; \ | |
52 | - fi;\ | |
53 | + echo -e $(release_submake_new) >> $(OBJDIR)/$@/release/Makefile; \ | |
54 | (cd $(OBJDIR)/$@/release; make) ; \ | |
55 | fi | |
a486aa77 | 56 | |
9012671a | 57 | |
ab43d4dc PS |
58 | diff -uNr atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmcia_Pci/Makefile |
59 | --- atmelwlandriver.orig/src/Pcmcia_Pci/Makefile 2004-06-05 06:11:18.000000000 +0200 | |
60 | +++ atmelwlandriver/src/Pcmcia_Pci/Makefile 2004-07-19 10:54:28.066481184 +0200 | |
9012671a | 61 | @@ -5,22 +5,7 @@ |
ab43d4dc | 62 | include .lastbuild |
a486aa77 | 63 | endif |
a486aa77 | 64 | |
9012671a | 65 | -ARCH=$(shell uname -m) |
ab43d4dc PS |
66 | -VR:=$(shell uname -r) |
67 | -ID:=$(shell id -u) | |
a486aa77 | 68 | -ifneq ($(VR),$(UNAME)) |
69 | -this: | |
ab43d4dc | 70 | -# @echo -ne "\\033[1;31m" |
a486aa77 | 71 | - @echo -ne "Running kernel doesn't match with the source" |
ab43d4dc | 72 | -# @echo -ne "\\033[0;39m" |
a486aa77 | 73 | - @echo |
74 | -endif | |
ab43d4dc | 75 | - |
ab43d4dc | 76 | -CC:=gcc |
9012671a PS |
77 | -CDEBUG:= -DPCMCIA_DEBUG=1 |
78 | -DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) -fno-optimize-sibling-calls | |
79 | -CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h | |
80 | -CFLAGS := -DLINUX_OS -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) | |
81 | +CFLAGS += -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) | |
a486aa77 | 82 | PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include |
9012671a | 83 | srcs := card.c command.c common.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c |
a486aa77 | 84 | pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs)) |
ab43d4dc PS |
85 | diff -uNr atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile |
86 | --- atmelwlandriver.orig/src/usb/Makefile 2004-06-05 06:11:18.000000000 +0200 | |
87 | +++ atmelwlandriver/src/usb/Makefile 2004-07-19 10:54:28.067481032 +0200 | |
9012671a PS |
88 | @@ -1,13 +1,8 @@ |
89 | include .lastbuild | |
90 | include $(TOPDIR)/.config | |
91 | -ARCH=$(shell uname -m) | |
ab43d4dc | 92 | MODULE := usbvnet.o |
9012671a PS |
93 | -CDEBUG := -DUSBDBG |
94 | -DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) -fno-optimize-sibling-calls | |
a486aa77 | 95 | USB_DES := $(MODULES_DES)/kernel/drivers/net |
ab43d4dc | 96 | -CC=gcc |
9012671a PS |
97 | -CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h |
98 | -CFLAGS :=-D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb | |
99 | +CFLAGS += -I$(KERNEL_SRC)/drivers/usb/core -I$(INC) -I$(INC)/usb | |
a486aa77 | 100 | |
9012671a PS |
101 | $(CFLAGS_y) |
102 | # Add extra compilation flags if under version 2.5 or higher | |
965c43c1 PS |
103 | diff -uNr atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/apps/cmd_line/Makefile |
104 | --- atmelwlandriver.orig/src/apps/cmd_line/Makefile 2004-06-05 06:11:18.000000000 +0200 | |
29ba95bd | 105 | +++ atmelwlandriver/src/apps/cmd_line/Makefile 2004-07-19 12:16:29.080700072 +0200 |
9012671a | 106 | @@ -1,22 +1,7 @@ |
965c43c1 PS |
107 | -KERNEL_VERSION_NUMBER=$(shell uname -r | cut -d . -f 2) |
108 | - | |
109 | -ifeq '$(KERNEL_VERSION_NUMBER)' '4' | |
110 | -include $(TOPDIR)/.config | |
111 | -endif | |
112 | - | |
113 | OBJs=../../../objs | |
9012671a PS |
114 | -FLAGS1:=-Wall -DATMEL_WLAN -DATMEL -O2 -g |
115 | +FLAGS1:=-Wall -DATMEL_WLAN -DATMEL $(OPT) | |
965c43c1 PS |
116 | FLAGS2:=-lncurses |
117 | -FLAGS3:=-DLOW_RES | |
118 | -CC:=gcc | |
119 | ||
120 | -ifeq '$(KERNEL_VERSION_NUMBER)' '4' | |
121 | -all: | |
122 | - $(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c | |
123 | - @install -m 755 lvnet $(OBJs)/ | |
124 | -else | |
9012671a | 125 | -INC = ../../includes |
965c43c1 | 126 | all: |
29ba95bd PS |
127 | - $(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c |
128 | + $(CC) $(FLAGS1) -I$(INC) -I/usr/include/ncurses -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c | |
965c43c1 PS |
129 | @install -m 755 lvnet $(OBJs)/ |
130 | -endif | |
1b9d59b0 PS |
131 | diff -uNr atmelwlandriver.orig/src/apps/fw-upgrade/Makefile atmelwlandriver/src/apps/fw-upgrade/Makefile |
132 | --- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile 2004-06-05 06:11:18.000000000 +0200 | |
133 | +++ atmelwlandriver/src/apps/fw-upgrade/Makefile 2004-07-19 12:27:38.317960544 +0200 | |
134 | @@ -7,7 +7,7 @@ | |
135 | CCC:=gcc | |
136 | CFLAGS:=$(shell wx-config --cxxflags) | |
137 | CFLAGS1:=$(shell wx-config --libs) | |
138 | -CCFLAGS:= -O2 -Wall -Wstrict-prototypes | |
139 | +CCFLAGS:=$(OPT) | |
140 | OUTDIR:="/usr/local/bin" | |
141 | ||
142 |