| 1 | --- a/Makefile |
| 2 | +++ b/Makefile |
| 3 | @@ -40,10 +40,7 @@ |
| 4 | # Makefile for the HAL-based Atheros driver. |
| 5 | # |
| 6 | |
| 7 | -ifeq ($(obj),) |
| 8 | -obj= . |
| 9 | -endif |
| 10 | - |
| 11 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 12 | TOP = $(obj) |
| 13 | |
| 14 | ifneq (svnversion.h,$(MAKECMDGOALS)) |
| 15 | --- a/ath/Makefile |
| 16 | +++ b/ath/Makefile |
| 17 | @@ -40,10 +40,7 @@ |
| 18 | # Makefile for the Atheros WLAN driver. |
| 19 | # |
| 20 | |
| 21 | -ifeq ($(obj),) |
| 22 | -obj= . |
| 23 | -endif |
| 24 | - |
| 25 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 26 | TOP = $(obj)/.. |
| 27 | |
| 28 | ifeq ($(strip $(BUS)),AHB) |
| 29 | --- a/ath_hal/Makefile |
| 30 | +++ b/ath_hal/Makefile |
| 31 | @@ -40,10 +40,7 @@ |
| 32 | # Makefile for the Atheros WLAN driver. |
| 33 | # |
| 34 | |
| 35 | -ifeq ($(obj),) |
| 36 | -obj= . |
| 37 | -endif |
| 38 | - |
| 39 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 40 | TOP = $(obj)/.. |
| 41 | |
| 42 | include $(TOP)/Makefile.inc |
| 43 | --- a/ath_rate/Makefile |
| 44 | +++ b/ath_rate/Makefile |
| 45 | @@ -1,7 +1,4 @@ |
| 46 | -ifeq ($(obj),) |
| 47 | -obj= . |
| 48 | -endif |
| 49 | - |
| 50 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 51 | TOP = $(obj)/.. |
| 52 | |
| 53 | obj-y := amrr/ onoe/ sample/ minstrel/ |
| 54 | --- a/ath_rate/amrr/Makefile |
| 55 | +++ b/ath_rate/amrr/Makefile |
| 56 | @@ -40,10 +40,7 @@ |
| 57 | # |
| 58 | # Makefile for the Atheros Rate Control Support. |
| 59 | # |
| 60 | -ifeq ($(obj),) |
| 61 | -obj= . |
| 62 | -endif |
| 63 | - |
| 64 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 65 | TOP = $(obj)/../.. |
| 66 | |
| 67 | obj-m += ath_rate_amrr.o |
| 68 | --- a/ath_rate/minstrel/Makefile |
| 69 | +++ b/ath_rate/minstrel/Makefile |
| 70 | @@ -38,10 +38,7 @@ |
| 71 | # |
| 72 | # Makefile for the Atheros Rate Control Support. |
| 73 | # |
| 74 | -ifeq ($(obj),) |
| 75 | -obj= . |
| 76 | -endif |
| 77 | - |
| 78 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 79 | TOP = $(obj)/../.. |
| 80 | |
| 81 | obj-m += ath_rate_minstrel.o |
| 82 | --- a/ath_rate/onoe/Makefile |
| 83 | +++ b/ath_rate/onoe/Makefile |
| 84 | @@ -40,10 +40,7 @@ |
| 85 | # |
| 86 | # Makefile for the Atheros Rate Control Support. |
| 87 | # |
| 88 | -ifeq ($(obj),) |
| 89 | -obj= . |
| 90 | -endif |
| 91 | - |
| 92 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 93 | TOP = $(obj)/../.. |
| 94 | |
| 95 | obj-m += ath_rate_onoe.o |
| 96 | --- a/ath_rate/sample/Makefile |
| 97 | +++ b/ath_rate/sample/Makefile |
| 98 | @@ -38,10 +38,7 @@ |
| 99 | # |
| 100 | # Makefile for the Atheros Rate Control Support. |
| 101 | # |
| 102 | -ifeq ($(obj),) |
| 103 | -obj= . |
| 104 | -endif |
| 105 | - |
| 106 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 107 | TOP = $(obj)/../.. |
| 108 | |
| 109 | obj-m += ath_rate_sample.o |
| 110 | --- a/net80211/Makefile |
| 111 | +++ b/net80211/Makefile |
| 112 | @@ -39,10 +39,7 @@ |
| 113 | # |
| 114 | # Makefile for the 802.11 WLAN modules. |
| 115 | # |
| 116 | -ifeq ($(obj),) |
| 117 | -obj= . |
| 118 | -endif |
| 119 | - |
| 120 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 121 | TOP = $(obj)/.. |
| 122 | # |
| 123 | # There is one authenticator mechanism: an in-kernel implementation |
| 124 | --- a/regression/Makefile |
| 125 | +++ b/regression/Makefile |
| 126 | @@ -1,7 +1,4 @@ |
| 127 | -ifeq ($(obj),) |
| 128 | -obj= . |
| 129 | -endif |
| 130 | - |
| 131 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 132 | TOP = $(obj)/.. |
| 133 | |
| 134 | obj-y := ccmp/ tkip/ wep/ |
| 135 | --- a/regression/ccmp/Makefile |
| 136 | +++ b/regression/ccmp/Makefile |
| 137 | @@ -1,10 +1,7 @@ |
| 138 | # |
| 139 | # Makefile for the CCMP regression test. |
| 140 | # |
| 141 | -ifeq ($(obj),) |
| 142 | -obj= . |
| 143 | -endif |
| 144 | - |
| 145 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 146 | TOP = $(obj)/../.. |
| 147 | |
| 148 | obj-m += ath_test_ccmp.o |
| 149 | --- a/regression/tkip/Makefile |
| 150 | +++ b/regression/tkip/Makefile |
| 151 | @@ -1,10 +1,7 @@ |
| 152 | # |
| 153 | # Makefile for the TKIP regression test. |
| 154 | # |
| 155 | -ifeq ($(obj),) |
| 156 | -obj= . |
| 157 | -endif |
| 158 | - |
| 159 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 160 | TOP = $(obj)/../.. |
| 161 | |
| 162 | obj-m += ath_test_tkip.o |
| 163 | --- a/regression/wep/Makefile |
| 164 | +++ b/regression/wep/Makefile |
| 165 | @@ -1,10 +1,7 @@ |
| 166 | # |
| 167 | # Makefile for the WEP regression test. |
| 168 | # |
| 169 | -ifeq ($(obj),) |
| 170 | -obj= . |
| 171 | -endif |
| 172 | - |
| 173 | +obj := $(firstword $(obj) $(SUBDIRS) .) |
| 174 | TOP = $(obj)/../.. |
| 175 | |
| 176 | obj-m += ath_test_wep.o |
| 177 | |
