← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-backports-modules-3.2.0/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Leann Ogasawara
  • Date: 2012-02-15 08:42:08 UTC
  • Revision ID: package-import@ubuntu.com-20120215084208-2gcs2zosufz014pi
Tags: 3.2.0-18.1
* Open Precise LBM
* Add compat-wireless v3.3
* Consolidated amd64 server flavour into generic
* Remove lpia control file
* Update Vcs-Git to ubuntu-preicse-lbm

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/cw-3.3/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/net/wireless/brcm80211/brcmfmac/Makefile
 
22
+++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
 
23
@@ -16,8 +16,8 @@
 
24
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
25
 
 
26
 ccflags-y += \
 
27
-       -Idrivers/net/wireless/brcm80211/brcmfmac       \
 
28
-       -Idrivers/net/wireless/brcm80211/include
 
29
+       -I$(obj)                \
 
30
+       -I$(obj)/../include
 
31
 
 
32
 obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
 
33
 brcmfmac-objs += \
 
34
--- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
 
35
+++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
 
36
@@ -17,9 +17,9 @@
 
37
 
 
38
 ccflags-y := \
 
39
        -D__CHECK_ENDIAN__ \
 
40
-       -Idrivers/net/wireless/brcm80211/brcmsmac \
 
41
-       -Idrivers/net/wireless/brcm80211/brcmsmac/phy \
 
42
-       -Idrivers/net/wireless/brcm80211/include
 
43
+       -I$(obj)                                \
 
44
+       -I$(obj)/phy                            \
 
45
+       -I$(obj)/../include
 
46
 
 
47
 BRCMSMAC_OFILES := \
 
48
        mac80211_if.o \
 
49
--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile
 
50
+++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile
 
51
@@ -16,8 +16,8 @@
 
52
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
53
 
 
54
 ccflags-y :=                           \
 
55
-       -Idrivers/net/wireless/brcm80211/brcmutil \
 
56
-       -Idrivers/net/wireless/brcm80211/include
 
57
+       -I$(obj)                        \
 
58
+       -I$(obj)/../include
 
59
 
 
60
 BRCMUTIL_OFILES := \
 
61
        utils.o
 
62
--- a/net/wireless/Makefile
 
63
+++ b/net/wireless/Makefile
 
64
@@ -18,6 +18,6 @@ cfg80211-$(CONFIG_CFG80211_INTERNAL_REGD
 
65
 ccflags-y += -D__CHECK_ENDIAN__
 
66
 
 
67
 $(obj)/regdb.c: $(src)/db.txt $(src)/genregdb.awk
 
68
-       @$(AWK) -f $(srctree)/$(src)/genregdb.awk < $< > $@
 
69
+       @$(AWK) -f $(src)/genregdb.awk < $< > $@
 
70
 
 
71
 clean-files := regdb.c