← Back to branch summary

~ubuntu-branches/ubuntu/natty/linux-backports-modules-2.6.38/natty-proposed

« back to all changes in this revision

Viewing changes to updates/cw-2.6.39/patches/35-fix-makefile-includes.patch

  • Committer: Bazaar Package Importer
  • Author(s): Tim Gardner, Tim Gardner
  • Date: 2011-06-08 10:44:09 UTC
  • Revision ID: james.westby@ubuntu.com-20110608104409-fnl8carkdo15bwsz
Tags: 2.6.38-10.6
[ Tim Gardner ]

Shorten compat-wireless package name to cw to accomodate
CDROM file name length restrictions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/cw-2.6.39/patches/35-fix-makefile-includes.patch
 
1
When some other headers are included in some makefile it must be 
 
2
relative to the current object file processed. When giving the full 
 
3
path the make process will search in the kernel tree for the headers.
 
4
 
 
5
--- a/drivers/net/wireless/rtl818x/rtl8180/Makefile
 
6
+++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile
 
7
@@ -2,4 +2,4 @@ rtl8180-objs            := dev.o rtl8225.o sa2400.
 
8
 
 
9
 obj-$(CONFIG_RTL8180)  += rtl8180.o
 
10
 
 
11
-ccflags-y += -Idrivers/net/wireless/rtl818x
 
12
+ccflags-y += -I$(obj)/..
 
13
--- a/drivers/net/wireless/rtl818x/rtl8187/Makefile
 
14
+++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile
 
15
@@ -2,4 +2,4 @@ rtl8187-objs            := dev.o rtl8225.o leds.o
 
16
 
 
17
 obj-$(CONFIG_RTL8187)  += rtl8187.o
 
18
 
 
19
-ccflags-y += -Idrivers/net/wireless/rtl818x
 
20
+ccflags-y += -I$(obj)/..
 
21
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
 
22
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
 
23
@@ -35,9 +35,9 @@ ccflags-y :=                  \
 
24
 ccflags-$(CONFIG_BRCMDBG)      += -DDHD_DEBUG
 
25
 
 
26
 ccflags-y += \
 
27
-       -Idrivers/staging/brcm80211/brcmfmac    \
 
28
-       -Idrivers/staging/brcm80211/include             \
 
29
-       -Idrivers/staging/brcm80211/util
 
30
+       -I$(obj)                \
 
31
+       -I$(obj)/../include     \
 
32
+       -I$(obj)/../util
 
33
 
 
34
 DHDOFILES = \
 
35
        wl_cfg80211.o \
 
36
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
 
37
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
 
38
@@ -23,10 +23,10 @@ ccflags-y :=                                \
 
39
        -DWL11N                                 \
 
40
        -DDBAND                                 \
 
41
        -DBCMNVRAMR                             \
 
42
-       -Idrivers/staging/brcm80211/brcmsmac \
 
43
-       -Idrivers/staging/brcm80211/brcmsmac/phy \
 
44
-       -Idrivers/staging/brcm80211/util \
 
45
-       -Idrivers/staging/brcm80211/include
 
46
+       -I$(obj)                                \
 
47
+       -I$(obj)/phy                            \
 
48
+       -I$(obj)/../util                        \
 
49
+       -I$(obj)/../include
 
50
 
 
51
 BRCMSMAC_OFILES := \
 
52
        wl_mac80211.o \