]>
Commit | Line | Data |
---|---|---|
a486aa77 | 1 | diff -urN atmelwlandriver/Makefile atmelwlandriver-Makefiles/Makefile |
2 | --- atmelwlandriver/Makefile 2003-12-04 17:20:24.000000000 +0100 | |
3 | +++ atmelwlandriver-Makefiles/Makefile 2003-12-20 22:52:55.000000000 +0100 | |
4 | @@ -28,27 +28,31 @@ | |
5 | @echo Building $(BUILD-y) | |
6 | @for i in $(BUILD-y); do make -C $$i all || exit 1; done | |
7 | ||
8 | -ifeq (.config, $(wildcard .config)) | |
9 | +#ifeq (.config, $(wildcard .config)) | |
10 | include .config | |
11 | -check:dummy | |
12 | -else | |
13 | -check:config | |
14 | -endif | |
15 | +#check:dummy | |
16 | +#else | |
17 | +#check:config | |
18 | +#endif | |
19 | ||
20 | BUILD-y:= | |
21 | BUILD-n:= | |
22 | BUILD- := | |
23 | ifeq ('$(CONFIG_PCMCIA)', 'y') | |
24 | BUILD-$(CONFIG_PCMCIA) += src/Pcmcia_Pci | |
25 | -ifeq ($(CONFIG_PCI), 'y') | |
26 | -endif | |
27 | -else | |
28 | -BUILD-$(CONFIG_PCI) += src/Pcmcia_Pci | |
29 | +#ifeq ($(CONFIG_PCI), 'y') | |
30 | +#endif | |
31 | +#else | |
32 | +#BUILD-$(CONFIG_PCI) += src/Pcmcia_Pci | |
33 | endif | |
34 | +ifeq ('$(CONFIG_USB)', 'y') | |
35 | BUILD-$(CONFIG_USB) += src/usb | |
36 | +endif | |
37 | +ifeq ('$(CONFIG_APPS)', 'y') | |
38 | BUILD-$(CONFIG_CMD_LINE) += src/apps/cmd_line | |
39 | BUILD-$(CONFIG_Winter) += src/apps/winter | |
40 | BUILD-$(CONFIG_XAPP) += src/apps/XWlan | |
41 | +endif | |
42 | ||
43 | ifeq '$(NEW_KERN)' 'y' | |
44 | MODEXT:=.ko | |
45 | @@ -73,23 +77,26 @@ | |
46 | ||
47 | install: | |
48 | set -x | |
49 | -ifeq '$(ID)' '0' | |
50 | - @if (ls $(OBJDIR)/pcm*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pcm*$(MODEXT) $(PCMCIA_DES); fi | |
51 | - @if (ls $(OBJDIR)/pci*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pci*$(MODEXT) $(PCI_DES); fi | |
52 | - @if (ls $(OBJDIR)/usb*$(MODEXT) >/dev/null 2>&1); then install -m 644 objs/usb*$(MODEXT) $(USB_DES); fi | |
53 | - @if [ -f $(OBJDIR)/lvnet ]; then install -m 755 $(OBJDIR)/lvnet /bin/; fi | |
54 | - @if [ -f $(OBJDIR)/winter ]; then install -m 755 $(OBJDIR)/winter /usr/X11R6/bin/; fi | |
55 | - @if [ -f $(OBJDIR)/xvnet ]; then install -m 755 $(OBJDIR)/xvnet /usr/X11R6/bin/; fi | |
56 | - @if [ -f $(SCRIPTSDIR)/fastvnet.sh ]; then install -m 755 $(SCRIPTSDIR)/fastvnet.sh /bin/; fi | |
57 | - @bash $(SCRIPTSDIR)/append.sh | |
58 | +#ifeq '$(ID)' '0' | |
59 | + @if (ls $(OBJDIR)/pcm*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pcm*$(MODEXT) $(MODDIR)/kernel/drivers/pcmcia; fi | |
60 | + @if (ls $(OBJDIR)/pci*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)/pci*$(MODEXT) $(MODDIR)/kernel/drivers/net; fi | |
61 | + @if (ls $(OBJDIR)/usb*$(MODEXT) >/dev/null 2>&1); then install -m 644 objs/usb*$(MODEXT) $(MODDIR)/kernel/drivers/usb; fi | |
62 | + @if (ls $(OBJDIR)-smp/pcm*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)-smp/pcm*$(MODEXT) $(MODDIR)smp/kernel/drivers/pcmcia; fi | |
63 | + @if (ls $(OBJDIR)-smp/pci*$(MODEXT) >/dev/null 2>&1); then install -m 644 $(OBJDIR)-smp/pci*$(MODEXT) $(MODDIR)smp/kernel/drivers/net; fi | |
64 | + @if (ls $(OBJDIR)-smp/usb*$(MODEXT) >/dev/null 2>&1); then install -m 644 objs-smp/usb*$(MODEXT) $(MODDIR)smp/kernel/drivers/usb; fi | |
65 | + @if [ -f $(OBJDIR)/lvnet ]; then install -m 755 $(OBJDIR)/lvnet $(DESTDIR)/bin/; fi | |
66 | + @if [ -f $(OBJDIR)/winter ]; then install -m 755 $(OBJDIR)/winter $(DESTDIR)/bin/; fi | |
67 | + @if [ -f $(OBJDIR)/xvnet ]; then install -m 755 $(OBJDIR)/xvnet $(DESTDIR)/bin/; fi | |
68 | + @if [ -f $(SCRIPTSDIR)/fastvnet.sh ]; then install -m 755 $(SCRIPTSDIR)/fastvnet.sh $(DESTDIR)/bin/; fi | |
69 | +# @bash $(SCRIPTSDIR)/append.sh | |
70 | @install -m 644 man/*.1 $(MAN_PATH) | |
71 | - depmod -aq | |
72 | - @echo OK | |
73 | -else | |
74 | +# depmod -aq | |
75 | +# @echo OK | |
76 | +#else | |
77 | # @echo -ne "\033[0;31m" | |
78 | - @echo "You must have root privileges to install the driver" | |
79 | +# @echo "You must have root privileges to install the driver" | |
80 | # @echo -ne "\033[1;37m" | |
81 | -endif | |
82 | +#endif | |
83 | ||
84 | dist: | |
85 | @mkdir $(tmpDIR) | |
86 | diff -urN atmelwlandriver/src/apps/cmd_line/Makefile atmelwlandriver-Makefiles/src/apps/cmd_line/Makefile | |
87 | --- atmelwlandriver/src/apps/cmd_line/Makefile 2003-12-04 17:20:24.000000000 +0100 | |
88 | +++ atmelwlandriver-Makefiles/src/apps/cmd_line/Makefile 2003-12-20 22:10:15.000000000 +0100 | |
89 | @@ -5,11 +5,11 @@ | |
90 | WPA_FLAG:= | |
91 | endif | |
92 | OBJs=../../../objs | |
93 | -FLAGS1:=$(WPA_FLAG) -DATMEL -O2 -g | |
94 | +FLAGS1:=$(WPA_FLAG) -DATMEL $(OPT) -g | |
95 | FLAGS2:=-lncurses | |
96 | FLAGS3:=-DLOW_RES | |
97 | CC:=gcc | |
98 | ||
99 | all: | |
100 | - $(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c | |
101 | + $(CC) $(FLAGS1) -I$(INC) -I/usr/include/ncurses -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c | |
102 | @install -m 755 lvnet $(OBJs)/ | |
103 | diff -urN atmelwlandriver/src/apps/winter/Makefile.rules atmelwlandriver-Makefiles/src/apps/winter/Makefile.rules | |
104 | --- atmelwlandriver/src/apps/winter/Makefile.rules 2003-12-04 17:20:24.000000000 +0100 | |
105 | +++ atmelwlandriver-Makefiles/src/apps/winter/Makefile.rules 2003-12-20 22:09:33.000000000 +0100 | |
106 | @@ -5,9 +5,10 @@ | |
107 | ||
108 | all: postmake | |
109 | ||
110 | -CC:=$(shell wx-config --cxx) | |
111 | -CFLAGS:=$(shell wx-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) | |
112 | -CFLAGS1:=$(shell wx-config --libs) | |
113 | +CC:=gcc | |
114 | +CFLAGS:=$(shell wxgtk-2.4-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(OPT) $(ARCH_SPECIFIC_CFLAGS) | |
115 | +CFLAGS1:=$(shell wxgtk-2.4-config --libs) | |
116 | + | |
117 | ||
118 | VPATH:=$(INC_DIR) $(SRC_DIR) $(RSRC_DIR) | |
119 | ||
120 | @@ -20,7 +21,7 @@ | |
121 | wxconfig: | |
122 | @config_exists=no;\ | |
123 | for path_dir in `echo $(PATH) | tr : ' '`; do\ | |
124 | - if test -f $$path_dir/wx-config; then\ | |
125 | + if test -f $$path_dir/wxgtk-2.4-config; then\ | |
126 | config_exists=yes;\ | |
127 | fi\ | |
128 | done;\ | |
129 | diff -urN atmelwlandriver/src/Pcmcia_Pci/Makefile atmelwlandriver-Makefiles/src/Pcmcia_Pci/Makefile | |
130 | --- atmelwlandriver/src/Pcmcia_Pci/Makefile 2003-12-04 17:20:24.000000000 +0100 | |
131 | +++ atmelwlandriver-Makefiles/src/Pcmcia_Pci/Makefile 2003-12-20 21:59:36.000000000 +0100 | |
132 | @@ -7,13 +7,13 @@ | |
133 | ||
134 | VR:=$(shell uname -r) | |
135 | ID:=$(shell id -u) | |
136 | -ifneq ($(VR),$(UNAME)) | |
137 | -this: | |
138 | +#ifneq ($(VR),$(UNAME)) | |
139 | +#this: | |
140 | # @echo -ne "\\033[1;31m" | |
141 | - @echo -ne "Running kernel doesn't match with the source" | |
142 | +# @echo -ne "Running kernel doesn't match with the source" | |
143 | # @echo -ne "\\033[0;39m" | |
144 | - @echo | |
145 | -endif | |
146 | +# @echo | |
147 | +#endif | |
148 | ||
149 | # Add extra compilation flags if under version 2.5 or higher | |
150 | NEWKERNFLAGS := -D__KERNEL__ -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=fastvnet_cs | |
151 | @@ -26,7 +26,8 @@ | |
152 | DEFS := -pipe -O2 -fomit-frame-pointer -fno-strict-aliasing | |
153 | ||
154 | CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h | |
155 | -CFLAGS := -DLINUX_OS -D__KERNEL__ $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) | |
156 | +#CFLAGS := -DLINUX_OS -D__KERNEL__ $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) | |
157 | +CFLAGS := $(KCFLAGS) -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y) | |
158 | PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include | |
159 | srcs := card.c command.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c | |
160 | pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs)) | |
161 | diff -urN atmelwlandriver/src/usb/Makefile atmelwlandriver-Makefiles/src/usb/Makefile | |
162 | --- atmelwlandriver/src/usb/Makefile 2003-12-04 17:20:24.000000000 +0100 | |
163 | +++ atmelwlandriver-Makefiles/src/usb/Makefile 2003-12-20 22:00:57.000000000 +0100 | |
164 | @@ -7,7 +7,7 @@ | |
165 | USB_DES := $(MODULES_DES)/kernel/drivers/net | |
166 | CC=gcc | |
167 | CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h | |
168 | -CFLAGS :=-D__KERNEL__ -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb -Wall $(CFLAGS_y) | |
169 | +CFLAGS := $(KCFLAGS) -I$(INC) -I$(INC)/usb $(CFLAGS_y) | |
170 | ||
171 | fws:=$(wildcard external*.h) $(wildcard internal*.h) | |
172 |