--- atmelwlandriver/Makefile.kernelv2.6.orig 2005-11-20 19:57:50.225388500 +0100 +++ atmelwlandriver/Makefile.kernelv2.6 2005-11-20 19:57:51.957496750 +0100 @@ -5,15 +5,13 @@ SCRIPTSDIR=$(TOPDIR)/scripts INC=$(TOPDIR)/src/includes VERSION=3.4.1.1 -MINOR_NUMBER=$(shell uname -r | cut -d . -f 3 | cut -d - -f 1) ID:=$(shell id -u) tmpDIR:=/tmp/atm$(shell date +%S.%s) tmpDES:=$(tmpDIR)/atmelwlandriver LVNET = $(shell pwd)/src/apps/cmd_line WINTER = $(shell pwd)/src/apps/winter -KERNEL_VERSION:=$(shell uname -r) -KERNEL_SOURCE:=/lib/modules/$(KERNEL_VERSION)/build +KERNEL_SOURCE:=/usr/src/linux PCMCIA_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/pcmcia PCI_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/net USB_DES = $(DESTDIR)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/usb @@ -104,34 +102,15 @@ $(all_targets): %: @echo Building $@ @if [ ! -d $(OBJDIR)/$@ ]; then echo Bootstraping target $@; mkdir $(OBJDIR)/$@; fi - @if [ ! -d $(OBJDIR)/$@/debug ]; then \ - mkdir $(OBJDIR)/$@/debug; \ - for f in $(srcs); do (cd $(OBJDIR)/$@/debug; ln -s $(SUBDIRS)/$$f .); done \ - fi @if [ ! -d $(OBJDIR)/$@/release ]; then \ mkdir $(OBJDIR)/$@/release; \ for f in $(srcs); do (cd $(OBJDIR)/$@/release; ln -s $(SUBDIRS)/$$f .); done \ fi - @echo -e "\tDebug" - @if [ "$(buildonly)" == debug ] || [ "$(buildonly)" == "" ]; then \ - echo obj-m=$@.o > $(OBJDIR)/$@/debug/Makefile; \ - echo all: >> $(OBJDIR)/$@/debug/Makefile; \ - if [ "$(MINOR_NUMBER)" -gt "5" ]; then \ - echo -e $(debug_submake_new) >> $(OBJDIR)/$@/debug/Makefile; \ - else \ - echo -e $(debug_submake_old) >> $(OBJDIR)/$@/debug/Makefile; \ - fi;\ - (cd $(OBJDIR)/$@/debug; make) ; \ - fi @echo -e "\tRelease" @if [ "$(buildonly)" == release ] || [ "$(buildonly)" == "" ]; then \ echo obj-m=$@.o > $(OBJDIR)/$@/release/Makefile; \ echo all: >> $(OBJDIR)/$@/release/Makefile; \ - if [ "$(MINOR_NUMBER)" -gt "5" ]; then \ - echo -e $(release_submake_new) >> $(OBJDIR)/$@/release/Makefile; \ - else \ - echo -e $(release_submake_old) >> $(OBJDIR)/$@/release/Makefile; \ - fi;\ + echo -e $(release_submake_new) >> $(OBJDIR)/$@/release/Makefile; \ (cd $(OBJDIR)/$@/release; make) ; \ fi