X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=atmelwlandriver-makefile.patch;h=a5e9492bc06662e20efa29ddfae13cd3f5d66d2f;hb=dd720771e3854ce2e82038b3f9f372197c1a4fe3;hp=6a487063de790706b14649bca7d2affc79a6f141;hpb=965c43c19b1dd93487131bd265488ded03ecb36a;p=packages%2Fatmelwlandriver.git

diff --git a/atmelwlandriver-makefile.patch b/atmelwlandriver-makefile.patch
index 6a48706..a5e9492 100644
--- a/atmelwlandriver-makefile.patch
+++ b/atmelwlandriver-makefile.patch
@@ -83,7 +83,7 @@ diff -uNr atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmci
  
  CFLAGS_$(CONFIG_MODVERSIONS):= -DMODULE -DMODVERSIONS -include $(KERNEL_SRC)/include/linux/modversions.h
 -CFLAGS := -DLINUX_OS -D__KERNEL__ $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
-+CFLAGS := $(KCFLAGS) -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
++CFLAGS := -I$(INC) -I$(INC)/pcmcia $(CFLAGS_y)
  PCMCIAADDONFLAGS := -I$(PCMCIA_SRC)/include
  srcs := card.c command.c fastvnet_cs.c interrupt.c mgmt.c rx.c tx.c vnet.c vnetlinux.c 
  pcisrcs := $(patsubst fastvnet_cs.c, fastvnet_cs.c ,$(srcs))
@@ -92,7 +92,7 @@ diff -uNr atmelwlandriver.orig/src/Pcmcia_Pci/Makefile atmelwlandriver/src/Pcmci
  	nm $(OBJDIR)/$(MODULE).o |sort -u >$(OBJDIR)/$(patsubst %.o,%.map,$(MODULE).o); 
  ifeq 	'$(NEW_KERN)' 'y'
 -	$(CC) $(MODOFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
-+	$(CC) $(KCFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
++	$(CC) $(CFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
  	ld -r -o $(OBJDIR)/$(MODULE).ko $(OBJDIR)/$(MODULE).o $(OBJDIR)/$(MAGICMOD).o
  endif
  
@@ -112,7 +112,7 @@ diff -uNr atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile
 -else
 -CFLAGS :=-D__KERNEL__ -O2 $(DEFS) -I$(KERNEL_SRC)/include -I$(INC) -I$(INC)/usb -Wall $(CFLAGS_y)
 -endif
-+CFLAGS :=$(KCFLAGS) -I$(KERNEL_SRC)/drivers/usb/core -I$(INC) -I$(INC)/usb $(CFLAGS_y)
++CFLAGS := -I$(KERNEL_SRC)/drivers/usb/core -I$(INC) -I$(INC)/usb $(CFLAGS_y)
  # Add extra compilation flags if under version 2.5 or higher
  NEWKERNFLAGS := -nostdinc -iwithprefix include -DMODULE -DKBUILD_BASENAME=vnetusba 
 -MODOFLAGS := -I$(KERNEL_SRC)/include -D__KERNEL__ -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -Iinclude/asm-i386/mach-default -DMODULE 
@@ -134,13 +134,13 @@ diff -uNr atmelwlandriver.orig/src/usb/Makefile atmelwlandriver/src/usb/Makefile
  final:$(objs) vnetusba.o
  ifeq 	'$(NEW_KERN)' 'y'
 -	$(CC) $(MODOFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
-+	$(CC) $(KCFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
++	$(CC) $(CFLAGS) -c -o $(OBJDIR)/$(MAGICMOD).o $(MAGICMOD).c
  	ld -m elf_i386 -r -o $(OBJDIR)/$(MODULE).ko vnetusba.o $(objs) $(OBJDIR)/$(MAGICMOD).o
  	@nm $(OBJDIR)/$(MODULE).ko |sort >../$(patsubst %.ko,%.map, $(MODULE).ko);
  else
 diff -uNr atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/apps/cmd_line/Makefile
 --- atmelwlandriver.orig/src/apps/cmd_line/Makefile	2004-06-05 06:11:18.000000000 +0200
-+++ atmelwlandriver/src/apps/cmd_line/Makefile	2004-07-19 11:11:02.173353968 +0200
++++ atmelwlandriver/src/apps/cmd_line/Makefile	2004-07-19 12:16:29.080700072 +0200
 @@ -1,22 +1,8 @@
 -KERNEL_VERSION_NUMBER=$(shell uname -r | cut -d . -f 2)
 -
@@ -162,6 +162,19 @@ diff -uNr atmelwlandriver.orig/src/apps/cmd_line/Makefile atmelwlandriver/src/ap
 -else
  INC = ../../includes
  all:
- 	$(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c 
+-	$(CC) $(FLAGS1) -I$(INC) -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c 
++	$(CC) $(FLAGS1) -I$(INC) -I/usr/include/ncurses -o lvnet $(FLAGS2) cofvnet.c sets.c survey.c 
  	@install -m 755 lvnet $(OBJs)/
 -endif
+diff -uNr atmelwlandriver.orig/src/apps/fw-upgrade/Makefile atmelwlandriver/src/apps/fw-upgrade/Makefile
+--- atmelwlandriver.orig/src/apps/fw-upgrade/Makefile	2004-06-05 06:11:18.000000000 +0200
++++ atmelwlandriver/src/apps/fw-upgrade/Makefile	2004-07-19 12:27:38.317960544 +0200
+@@ -7,7 +7,7 @@
+ CCC:=gcc
+ CFLAGS:=$(shell wx-config --cxxflags) 
+ CFLAGS1:=$(shell wx-config --libs)
+-CCFLAGS:= -O2 -Wall -Wstrict-prototypes
++CCFLAGS:=$(OPT)
+ OUTDIR:="/usr/local/bin"
+ 
+