Adjust build system for Linux 2.6.26

During the second stage of the module build, Linux 2.6.26 does not
define $(obj).  Try using $(SUBDIRS) as $(obj) before falling back to
the current directory.

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3603 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/Makefile b/Makefile
index 4cace036585ffb1e85ddc276920584c1e2dbce1c..d5a8199db5134cc196e61861f0a03d3fc534f8bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,7 @@
 # Makefile for the HAL-based Atheros driver.
 #
 
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)
 
 ifneq (svnversion.h,$(MAKECMDGOALS))

diff --git a/ath/Makefile b/ath/Makefile
index d631f7b4b7bb391f1fa01acab5a120604a65d5e9..e0dbd20b91eaaf79813393182c74e17b1ab75bd0 100644 (file)
--- a/ath/Makefile
+++ b/ath/Makefile
@@ -40,10 +40,7 @@
 # Makefile for the Atheros WLAN driver.
 #
 
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/..
 
 ifeq ($(strip $(BUS)),AHB)

diff --git a/ath_hal/Makefile b/ath_hal/Makefile
index 6b1b90cd22b1da7eef51ba9b5f91485c313a7176..7600418618826c4bfd6af8d798b93a8fa15bab72 100644 (file)
--- a/ath_hal/Makefile
+++ b/ath_hal/Makefile
@@ -40,10 +40,7 @@
 # Makefile for the Atheros WLAN driver.
 #
 
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/..
 
 include $(TOP)/Makefile.inc

diff --git a/ath_rate/Makefile b/ath_rate/Makefile
index 8fba7df2aaee36c8436fc6aef7f4d958a6af7e6e..9379c14e371971b5a544a6fe723d5aa58987959d 100644 (file)
--- a/ath_rate/Makefile
+++ b/ath_rate/Makefile
@@ -1,7 +1,4 @@
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/..
 
 obj-y := amrr/ onoe/ sample/ minstrel/

diff --git a/ath_rate/amrr/Makefile b/ath_rate/amrr/Makefile
index 0280dd8f21f7d31cd3e433f14cc4f5bb42c411db..37f68d946b6cb69d1a82bcac2bb08a8cefff7ce5 100644 (file)
--- a/ath_rate/amrr/Makefile
+++ b/ath_rate/amrr/Makefile
@@ -40,10 +40,7 @@
 #
 # Makefile for the Atheros Rate Control Support.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/../..
 
 obj-m          += ath_rate_amrr.o

diff --git a/ath_rate/minstrel/Makefile b/ath_rate/minstrel/Makefile
index 0d8046e9394e54fd12bf4ba87d671019165bb9cf..24f247abc2dea4509f751456db9842412d5c81f0 100644 (file)
--- a/ath_rate/minstrel/Makefile
+++ b/ath_rate/minstrel/Makefile
@@ -38,10 +38,7 @@
 #
 # Makefile for the Atheros Rate Control Support.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/../..
 
 obj-m          += ath_rate_minstrel.o

diff --git a/ath_rate/onoe/Makefile b/ath_rate/onoe/Makefile
index 3b595c389752afff680b7be54b7b69ec144d6698..11689cf4ab5d8a2004b9bff6356306e826b413c5 100644 (file)
--- a/ath_rate/onoe/Makefile
+++ b/ath_rate/onoe/Makefile
@@ -40,10 +40,7 @@
 #
 # Makefile for the Atheros Rate Control Support.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/../..
 
 obj-m          += ath_rate_onoe.o

diff --git a/ath_rate/sample/Makefile b/ath_rate/sample/Makefile
index 13874b85cc9ac4bf609fdc536ad3ecf511f13575..ba3735a787bb69f033aa06693195a30db65761d2 100644 (file)
--- a/ath_rate/sample/Makefile
+++ b/ath_rate/sample/Makefile
@@ -38,10 +38,7 @@
 #
 # Makefile for the Atheros Rate Control Support.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/../..
 
 obj-m          += ath_rate_sample.o

diff --git a/net80211/Makefile b/net80211/Makefile
index bdbdf9969440df0f824426d69ad2ebbc19c79f99..6a14996d21a650bbae435b2a64b0737853379a6e 100644 (file)
--- a/net80211/Makefile
+++ b/net80211/Makefile
@@ -39,10 +39,7 @@
 #
 # Makefile for the 802.11 WLAN modules.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/..
 #
 # There is one authenticator mechanism: an in-kernel implementation

diff --git a/regression/Makefile b/regression/Makefile
index c40c0c1d06662a6b010f208c052d9b6a8fb223f1..1ebb19a7f7f763e67d375bb2d602512652a0f27b 100644 (file)
--- a/regression/Makefile
+++ b/regression/Makefile
@@ -1,7 +1,4 @@
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/..
 
 obj-y := ccmp/ tkip/ wep/

diff --git a/regression/ccmp/Makefile b/regression/ccmp/Makefile
index 0a74d88d944d39365d173a4389a5e0e13689136f..a1b9dff83bfa7bfd9f839e07b2d2eb5834495913 100644 (file)
--- a/regression/ccmp/Makefile
+++ b/regression/ccmp/Makefile
@@ -1,10 +1,7 @@
 #
 # Makefile for the CCMP regression test.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/../..
 
 obj-m                  += ath_test_ccmp.o

diff --git a/regression/tkip/Makefile b/regression/tkip/Makefile
index a6487080d42e81c8ead12160a49486826f73301b..3320812e9bfe8fc30614b2887f1a879092a17f1f 100644 (file)
--- a/regression/tkip/Makefile
+++ b/regression/tkip/Makefile
@@ -1,10 +1,7 @@
 #
 # Makefile for the TKIP regression test.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/../..
 
 obj-m                  += ath_test_tkip.o

diff --git a/regression/wep/Makefile b/regression/wep/Makefile
index faaa5283ecad3d7e7eb5951db426508d173b0bdd..11271b11d29605742b967565dfe39ac253b8f8b2 100644 (file)
--- a/regression/wep/Makefile
+++ b/regression/wep/Makefile
@@ -1,10 +1,7 @@
 #
 # Makefile for the WEP regression test.
 #
-ifeq ($(obj),)
-obj=   .
-endif
-
+obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)/../..
 
 obj-m                  += ath_test_wep.o