diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-20 16:25:40 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-20 16:25:40 -0500 |
| commit | 8bf4c09b99cccefb7502eb695f85c70f302b2cfe (patch) | |
| tree | d717da427f9bb6bf66c293553d5bf2e755204975 | |
| parent | 4ccd55e1d3076acf71e2bcabce6a26e9bd02a00d (diff) | |
| download | compat-wireless-2.6-old-8bf4c09b99cccefb7502eb695f85c70f302b2cfe.tar.gz | |
Fixes a few bugs on the build process:
* ensure we use our own config to determine which drivers to build.
Be paranoid and include config.mk once in the beginning and
another time during the build process
* Fixes issues during install target users were facing
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
| -rw-r--r-- | Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
@@ -8,19 +8,12 @@ endif KLIB_BUILD ?= $(KLIB)/build MADWIFI=$(shell modprobe -l ath_pci) -# These exported as they are used by the scripts -# to check config and compat autoconf -export COMPAT_CONFIG=config.mk -export CONFIG_CHECK=.$(COMPAT_CONFIG)_md5sum.txt -export COMPAT_AUTOCONF=include/linux/compat_autoconf.h -export CREL=$(shell cat $(PWD)/compat-release) -export CREL_CHECK:=.compat_autoconf_$(CREL) - -include $(PWD)/$(COMPAT_CONFIG) ifneq ($(KERNELRELEASE),) -NOSTDINC_FLAGS := -I$(PWD)/include/ -include $(M)/include/net/compat.h $(CFLAGS) +include $(src)/$(COMPAT_CONFIG) + +NOSTDINC_FLAGS := -I$(src)/include/ -include $(M)/include/net/compat.h $(CFLAGS) obj-y := net/wireless/ net/mac80211/ net/ieee80211/ \ drivers/ssb/ \ @@ -28,8 +21,19 @@ obj-y := net/wireless/ net/mac80211/ net/ieee80211/ \ drivers/net/wireless/ else + export PWD := $(shell pwd) +# These exported as they are used by the scripts +# to check config and compat autoconf +export COMPAT_CONFIG=config.mk +export CONFIG_CHECK=.$(COMPAT_CONFIG)_md5sum.txt +export COMPAT_AUTOCONF=include/linux/compat_autoconf.h +export CREL=$(shell cat $(PWD)/compat-release) +export CREL_CHECK:=.compat_autoconf_$(CREL) + +include $(PWD)/$(COMPAT_CONFIG) + all: modules modules: $(CREL_CHECK) |