atmelwlandriver-makefile.patch

   1 diff -dur atmelwlandriver.orig/Makefile.kernelv2.6 atmelwlandriver/Makefile.kernelv2.6
   2 --- atmelwlandriver.orig/Makefile.kernelv2.6    2004-08-25 05:17:05.000000000 +0200
   3 +++ atmelwlandriver/Makefile.kernelv2.6 2004-08-30 21:22:33.286984975 +0200
   4 @@ -5,15 +5,13 @@
   5  SCRIPTSDIR=$(TOPDIR)/scripts
   6  INC=$(TOPDIR)/src/includes
   7  VERSION=3.4.0.2
   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 = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/pcmcia
  19  PCI_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/net
  20  USB_DES = $(DESTDIR)/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 diff -dur atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmcia_Pci/Makefile
  58 --- atmelwlandriver.orig/src/Pcmcia_Pci/Makefile        2004-08-25 05:17:04.000000000 +0200
  59 +++ atmelwlandriver/src/Pcmcia_Pci/Makefile     2004-08-30 21:21:59.985610940 +0200
  60 @@ -5,22 +5,7 @@
  61  include .lastbuild
  62  endif
  63
  64 -ARCH=$(shell uname -m)
  65 -VR:=$(shell uname -r)
  66 -ID:=$(shell id -u)
  67 -ifneq ($(VR),$(UNAME))
  68 -this:
  69 -#      @echo -ne "\\033[1;31m"
  70 -       @echo -ne "Running kernel doesn't match with the source"
  71 -#      @echo -ne "\\033[0;39m"
  72 -       @echo
  73 -endif
  74 -
  75 -CC:=gcc
  76 -CDEBUG:= -DPCMCIA_DEBUG=1
  77 -DEFS :=  -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) -fno-optimize-sibling-calls
  78 -CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
  79 -CFLAGS := -DLINUX_OS -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
  80 +CFLAGS += -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
  81  PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include
  82  srcs := card.c command.c common.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c
  83  pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs))
  84 diff -dur atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/apps/cmd_line/Makefile
  85 --- atmelwlandriver.orig/src/apps/cmd_line/Makefile     2004-08-25 05:17:04.000000000 +0200
  86 +++ atmelwlandriver/src/apps/cmd_line/Makefile  2004-08-30 21:21:59.988610523 +0200
  87 @@ -1,22 +1,8 @@
  88 -KERNEL_VERSION_NUMBER=$(shell uname -r | cut -d . -f 2)
  89 -
  90 -ifeq '$(KERNEL_VERSION_NUMBER)' '4'
  91 -include $(TOPDIR)/.config
  92 -endif
  93 -
  94  OBJs=../../../objs
  95 -FLAGS1:=-Wall -DATMEL_WLAN -DATMEL -O2 -g
  96 +FLAGS1:=-Wall -DATMEL_WLAN -DATMEL $(OPT)
  97  FLAGS2:=-lncurses
  98 -FLAGS3:=-DLOW_RES
  99 -CC:=gcc
 100
 101 -ifeq '$(KERNEL_VERSION_NUMBER)' '4'
 102 -all:
 103 -       $(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c
 104 -       @install -m 755 lvnet $(OBJs)/
 105 -else
 106  INC = ../../includes
 107  all:
 108 -       $(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c
 109 +       $(CC) $(FLAGS1) -I$(INC) -I/usr/include/ncurses -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c
 110         @install -m 755 lvnet $(OBJs)/
 111 -endif
 112 diff -dur atmelwlandriver.orig/src/apps/fw-upgrade/Makefile atmelwlandriver/src/apps/fw-upgrade/Makefile
 113 --- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile   2004-08-25 05:17:04.000000000 +0200
 114 +++ atmelwlandriver/src/apps/fw-upgrade/Makefile        2004-08-30 21:21:59.988610523 +0200
 115 @@ -7,7 +7,7 @@
 116  CCC:=gcc
 117  CFLAGS:=$(shell wx-config --cxxflags)
 118  CFLAGS1:=$(shell wx-config --libs)
 119 -CCFLAGS:= -O2 -Wall -Wstrict-prototypes
 120 +CCFLAGS:=$(OPT)
 121  OUTDIR:="/usr/local/bin"
 122
 123
 124 diff -dur atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile
 125 --- atmelwlandriver.orig/src/usb/Makefile       2004-08-25 05:17:05.000000000 +0200
 126 +++ atmelwlandriver/src/usb/Makefile    2004-08-30 21:21:59.987610662 +0200
 127 @@ -1,13 +1,8 @@
 128  include .lastbuild
 129  include $(TOPDIR)/.config
 130 -ARCH=$(shell uname -m)
 131  MODULE := usbvnet.o
 132 -CDEBUG := -DUSBDBG
 133 -DEFS := -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=$(ARCH) -fno-optimize-sibling-calls
 134  USB_DES := $(MODULES_DES)/kernel/drivers/net
 135 -CC=gcc
 136 -CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
 137 -CFLAGS :=-D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb
 138 +CFLAGS += -I$(KERNEL_SRC)/drivers/usb/core -I$(INC) -I$(INC)/usb
 139
 140  $(CFLAGS_y)
 141  # Add extra compilation flags if under version 2.5 or higher