atmelwlandriver-makefile.patch

   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
   7  VERSION=3.4.0.1
   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
  14
  15 -KERNEL_VERSION:=$(shell uname -r)
  16 -KERNEL_SOURCE:=/lib/modules/$(KERNEL_VERSION)/build
  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
  56
  57
  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
  61 @@ -5,22 +5,7 @@
  62  include .lastbuild
  63  endif
  64
  65 -ARCH=$(shell uname -m)
  66 -VR:=$(shell uname -r)
  67 -ID:=$(shell id -u)
  68 -ifneq ($(VR),$(UNAME))
  69 -this:
  70 -#      @echo -ne "\\033[1;31m"
  71 -       @echo -ne "Running kernel doesn't match with the source"
  72 -#      @echo -ne "\\033[0;39m"
  73 -       @echo
  74 -endif
  75 -
  76 -CC:=gcc
  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)
  82  PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include
  83  srcs := card.c command.c common.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c
  84  pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs))
  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
  88 @@ -1,13 +1,8 @@
  89  include .lastbuild
  90  include $(TOPDIR)/.config
  91 -ARCH=$(shell uname -m)
  92  MODULE := usbvnet.o
  93 -CDEBUG := -DUSBDBG
  94 -DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) -fno-optimize-sibling-calls
  95  USB_DES := $(MODULES_DES)/kernel/drivers/net
  96 -CC=gcc
  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
 100
 101  $(CFLAGS_y)
 102  # Add extra compilation flags if under version 2.5 or higher
 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
 105 +++ atmelwlandriver/src/apps/cmd_line/Makefile  2004-07-19 12:16:29.080700072 +0200
 106 @@ -1,22 +1,7 @@
 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
 114 -FLAGS1:=-Wall -DATMEL_WLAN -DATMEL -O2 -g
 115 +FLAGS1:=-Wall -DATMEL_WLAN -DATMEL $(OPT)
 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
 125 -INC = ../../includes
 126  all:
 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
 129         @install -m 755 lvnet $(OBJs)/
 130 -endif
 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